OSDN Git Service

Merge from feature_merge branch. Build TortoiseMerge successfully.
[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitSetup / Includes.wxi
index f8ddd52..2c308dc 100644 (file)
        <!-- Target specific component GUIDs ............................................. -->\r
 \r
        <?if $(var.Platform) = "x64" ?>\r
-       <?define GuidInfoFiles="B776F75C-B019-44b1-957A-3F58D3A225CF"?>\r
+       <?define GuidInfoFiles="78ACAFC6-6F62-4a58-85DC-E4FE52AEA41E"?>\r
        <?define GuidProgramMenuFolder="B776F75C-B019-44b1-957A-3F58D3A225CF"?>\r
 \r
        <?define GuidShellRegistry="9E011A3C-F5D1-47ab-8BE2-443C2FFF9499"?>\r
-       <?define GuidMachineRegistry="9E011A3C-F5D1-47ab-8BE2-443C2FFF9499"?>\r
+       <?define GuidMachineRegistry="E61BA450-C3DF-4ea5-98D4-240E4B05C9C4"?>\r
        <?define GuidApproveShellComponents="E7E43AE0-DB46-4af9-95EA-2EF7AD3F2119"?>\r
        <?define GuidSvnProtocol="0AD2B787-A9B3-4ad7-99A5-EC6DFF0EB2B7"?>\r
        <?define GuidASPNETHack="C9279E7B-3D81-4c9e-962F-987252011A29"?>\r
@@ -69,6 +69,7 @@
        <?define GuidLibSSL="CB2A61D8-AE23-4b9b-AC7D-473E2610367E"?>\r
        <?define GuidBerkeleyDB="D1002679-2234-4c1e-AEBD-F65DAE45A02E"?>\r
        <?define GuidAPR="72EB77A1-E5CD-4cdb-BFC2-77FDCFD04ACF"?>\r
+       <?define GuidGitLib="61EC5A0E-0B76-4e47-90A9-E0CF2E893444"?>\r
        <?define GuidSASL="6836861E-C998-4c3c-8671-97ADA341AD60"?>\r
        <?define GuidGettext="5C19D01A-557F-4568-9368-852BD62B85A0"?>\r
        <?define GuidCrashRpt="69B216BC-60D2-4675-A4E5-1ECFB26A4AED"?>\r
        <?define GuidIconsClassic="1123191B-D931-49ae-A6D0-551CC82B8E83"?>\r
        <?define GuidIconsCVSClassic="5D337941-A1FA-46a4-9B23-B6EDB133D97C"?>\r
        <?define GuidIconsModern="4C840CEE-A967-4784-AF1C-617757D60DBB"?>\r
-       <?define GuidIconsXPStyle="53FBA4D1-B436-4f1c-875C-0A7FA18002FE"?>\r
-       <?define GuidIconsMarkPhippard="53FBA4D1-B436-4f1c-875C-0A7FA18002FE"?>\r
-       <?define GuidIconsStraight="53FBA4D1-B436-4f1c-875C-0A7FA18002FE"?>\r
-\r
+       <?define GuidIconsXPStyle="96412A1D-3EE2-4874-8CFC-8EF4D0E36467"?>\r
+       <?define GuidIconsMarkPhippard="9151E386-6DD8-45a8-8C04-EBEBD9D8E179"?>\r
+       <?define GuidIconsStraight="669EE534-B358-489e-AD81-544A32172FE7"?>\r
+  <?define RegSSHPLINK="112230AA-AB13-4667-AD78-DC8EBEA2ED26"?>\r
+  <?define RegSSHOpen="0E21B3B2-FA54-411b-9AF3-BB275F169A27"?>\r
+  \r
        <?else?>\r
 \r
        <?define GuidInfoFiles="424219CC-2F91-49ad-B0EF-DB6A61575C99"?>\r
        <?define GuidLibSSL="BD9DD138-AEA4-4cf3-982D-8B5EB2A510D9"?>\r
        <?define GuidBerkeleyDB="BDFC7A7D-6C1A-4da1-9CB6-40D2FB41FB3A"?>\r
        <?define GuidAPR="DFBE3185-5272-4880-9ED3-F50F21EA9BE7"?>\r
+       <?define GuidGitLib="45615857-0FA0-43c1-9595-4C72A03AD1AC"?>\r
        <?define GuidSASL="64F29E1B-9B7A-4bf0-A738-32BDD69DE7D8"?>\r
        <?define GuidGettext="4B23E70B-B46A-4ba2-8EDA-7295C8B75303"?>\r
        <?define GuidCrashRpt="2B7AD90B-41D9-4a10-834F-1CDD6E366AC7"?>\r
        <?define GuidIconsXPStyle="EA15DA03-D008-4d2e-8BC4-F20E0A01418C"?>\r
        <?define GuidIconsMarkPhippard="40D1B81D-F8FE-4a97-BCF0-F58BE2C9D7A9"?>\r
        <?define GuidIconsStraight="6176FFF7-3626-4464-8B71-4A5E2551A2B8"?>\r
-\r
+       <?define RegSSHPLINK="112230AA-AB13-4667-AD78-DC8EBEA2ED26"?>\r
+       <?define RegSSHOpen="0E21B3B2-FA54-411b-9AF3-BB275F169A27"?>\r
        <?endif?>\r
 \r
 </Include>\r