diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index fb5f182..7c58fc4 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 4042b0a..7e21ec7 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 3ba3298..6cced90 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index 5cdfa42..96e2f77 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -57,7 +57,6 @@ System::Void Form1::saveTmp( System::String ^filename ) MasterEditorTWL::appendXmlTag( doc, form, "BackupOther", this->tboxBackupOther->Text ); MasterEditorTWL::appendXmlTag( doc, form, "ReleaseForeign", (this->cboxReleaseForeign->Checked)?"Y":"N" ); MasterEditorTWL::appendXmlTag( doc, form, "Remarks", this->tboxCaption->Text ); - MasterEditorTWL::appendXmlTag( doc, form, "SubmitWay", "None" ); // —p“r cli::array ^rbuts = gcnew cli::array diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index 3502fe9..065041a 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj index 7e0ad11..9e1ecc6 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj @@ -27,14 +27,8 @@ } "Entry" { - "MsmKey" = "8:_18FEE5202D804C31868A2B05D45AB612" - "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1E4923FAC3F147C1AC662116D735ADE5" - "OwnerKey" = "8:_18FEE5202D804C31868A2B05D45AB612" + "MsmKey" = "8:_28C40D3D666B4222AFFE42A0A2F31772" + "OwnerKey" = "8:_68A30B41118F42A79D08EE8ED7FACEAA" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -69,6 +63,12 @@ } "Entry" { + "MsmKey" = "8:_68A30B41118F42A79D08EE8ED7FACEAA" + "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_6EC739CA561443E48045379A268C1657" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -408,14 +408,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.10.4105.40924, Culture=en, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.10.4105.41660, Culture=en, processorArchitecture=MSIL" "ScatterAssemblies" { - "_7DAFD42678FC4D69A3A6BC6E6726AB10" - { - "Name" = "8:MasterEditorTWL.resources.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:..\\Release\\en\\MasterEditorTWL.resources.dll" "TargetName" = "8:" @@ -499,14 +494,9 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.10.4105.40924, Culture=ja, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.10.4105.41660, Culture=ja, processorArchitecture=MSIL" "ScatterAssemblies" { - "_BFEA9BAA0DBF4332913A71EDE89FC3CD" - { - "Name" = "8:MasterEditorTWL.resources.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:..\\Release\\ja\\MasterEditorTWL.resources.dll" "TargetName" = "8:" @@ -667,7 +657,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MasterEditorTWL" "ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}" - "PackageCode" = "8:{DCD5888E-A31E-4D41-B268-4E722937331E}" + "PackageCode" = "8:{0797D1A2-028D-4178-9712-65DF4C27C6A1}" "UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -1196,11 +1186,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_18FEE5202D804C31868A2B05D45AB612" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_28C40D3D666B4222AFFE42A0A2F31772" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" + "SourcePath" = "8:microsoft_vc90_crt_x86.msm" "Properties" { } @@ -1210,11 +1200,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1E4923FAC3F147C1AC662116D735ADE5" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_68A30B41118F42A79D08EE8ED7FACEAA" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_crt_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" "Properties" { } @@ -1229,7 +1219,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7746D2D347F0423FB46FA2300F6158A4" { - "SourcePath" = "8:..\\Release\\MasterEditorTWL.exe" + "SourcePath" = "8:..\\Debug\\MasterEditorTWL.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_1494B8B199184797B9C812877A4DFB7F"