Merge from feature_merge branch. Build TortoiseMerge successfully.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitSetup / Includes.wxi

diff --git a/src/TortoiseGitSetup/Includes.wxi b/src/TortoiseGitSetup/Includes.wxi
index 58a5b98..2c308dc 100644 (file)
--- a/src/TortoiseGitSetup/Includes.wxi
+++ b/src/TortoiseGitSetup/Includes.wxi
@@ -100,7 +100,9 @@
        <?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 GuidIconsXPStyle="96412A1D-3EE2-4874-8CFC-8EF4D0E36467"?>\r
        <?define GuidIconsMarkPhippard="9151E386-6DD8-45a8-8C04-EBEBD9D8E179"?>\r
        <?define GuidIconsStraight="669EE534-B358-489e-AD81-544A32172FE7"?>\r

-\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
        <?else?>\r
 \r
        <?define GuidInfoFiles="424219CC-2F91-49ad-B0EF-DB6A61575C99"?>\r