diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb index 77dbfe0..55e9cba 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb and b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.suo b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.suo index c475ffa..4f9fc65 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.suo and b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Release/BuildLog.htm index b0c36af..0bc5463 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Release/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker_Setup/MasterEditorTWLChecker_Setup.vdproj b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker_Setup/MasterEditorTWLChecker_Setup.vdproj index c7f0a34..9cf26e2 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker_Setup/MasterEditorTWLChecker_Setup.vdproj +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker_Setup/MasterEditorTWLChecker_Setup.vdproj @@ -39,6 +39,12 @@ } "Entry" { + "MsmKey" = "8:_3832EB2ACDAD42848756988E9BDD8CF3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_49C040AE0F5A48FD851350336101118A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -93,12 +99,6 @@ } "Entry" { - "MsmKey" = "8:_7E39D12E1A2B4502A644DD4F0AD9FB72" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_864984A2E9C74D2DABB2A82DABA2FCDA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -153,6 +153,12 @@ } "Entry" { + "MsmKey" = "8:_C3DDF8C005E840B78529BA1F1C53E582" + "OwnerKey" = "8:_D801C614827E469C83652433008165FD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_CA2D37D0D1D9498183292FE6A4A78C18" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -177,6 +183,12 @@ } "Entry" { + "MsmKey" = "8:_D801C614827E469C83652433008165FD" + "OwnerKey" = "8:_97CE56BC91094FBFB083E119975EE3CE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_DB1EEF0F1C564E03B4AD772D73F6718E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -187,6 +199,12 @@ "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_97CE56BC91094FBFB083E119975EE3CE" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -372,6 +390,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3832EB2ACDAD42848756988E9BDD8CF3" + { + "SourcePath" = "8:D:\\TwlToolsRED\\tests\\MasterEditorTWL_mrc_roms\\デバッグ項目_MRC.xls" + "TargetName" = "8:デバッグ項目_MRC.xls" + "Tag" = "8:" + "Folder" = "8:_ED54FB5333F541509640FA1C786BC369" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_49C040AE0F5A48FD851350336101118A" { "SourcePath" = "8:..\\TMP_J.XML" @@ -552,26 +590,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7E39D12E1A2B4502A644DD4F0AD9FB72" - { - "SourcePath" = "8:D:\\TwlToolsRED\\tests\\MasterEditorTWL_mrc_roms\\デバッグ項目_MRC.xls" - "TargetName" = "8:デバッグ項目_MRC.xls" - "Tag" = "8:" - "Folder" = "8:_ED54FB5333F541509640FA1C786BC369" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_864984A2E9C74D2DABB2A82DABA2FCDA" { "SourcePath" = "8:D:\\TwlToolsRED\\docs\\MasterEditorTWL\\デバッグ項目_提出確認書.xls" @@ -1468,6 +1486,34 @@ } "MergeModule" { + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C3DDF8C005E840B78529BA1F1C53E582" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:microsoft_vc90_crt_x86.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D801C614827E469C83652433008165FD" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } } "ProjectOutput" { diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/config.xml b/build/tools/MasterEditor/MasterEditorTWLChecker/config.xml index c393dfc..9119cb8 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/config.xml +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/config.xml @@ -32,7 +32,7 @@ - A (全年齢)A (All ages) + A (全年齢) または 教育・データベースA (All ages) or education/database B (12歳以上)B (Ages 12 and up) C (15歳以上)C (Ages 15 and up) D (17歳以上)D (Ages 17 and up)