Update changelog and version number

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

diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi
index 106ebe2..1087796 100644 (file)
--- a/src/TortoiseGitSetup/FeaturesFragment.wxi
+++ b/src/TortoiseGitSetup/FeaturesFragment.wxi
@@ -15,10 +15,10 @@
                        <ComponentRef Id="C__TortoiseMergeShortcuts" />\r
                        \r
       <ComponentRef Id="C__TortoiseBlame" />\r
-<!--           \r
+               \r
       <ComponentRef Id="C__TortoiseIDiff" />\r
                        <ComponentRef Id="C__TortoiseIDiffShortcuts" />\r
--->\r
+\r
                        <ComponentRef Id="C__TortoiseUDiff" />\r
 \r
                        <ComponentRef Id="C__PlainSettingsShortcuts" />\r
@@ -41,9 +41,11 @@
                                <MergeRef Id="MFC Policy" />\r
                                <MergeRef Id="MFCLOC" />\r
                                <MergeRef Id="MFCLOC Policy" />\r
-                       </Feature>\r
+        <MergeRef Id="ATL" />\r
+        <MergeRef Id="ATL Policy" />\r
+      </Feature>\r
                        <Feature Id="F_OVL" Level="1" Title="Tortoise Overlay handler" Description="The overlay handler for all Tortoise clients" TypicalDefault="install" Display="hidden" >\r
-                               <!--<MergeRef Id="Ovlays" />-->\r
+                               <MergeRef Id="Ovlays" />\r
                        </Feature>\r
 \r
                        <Feature Id="MoreIcons" Level="1" Title="Additional icon sets" Description="Additional sets of icon overlays in different styles" TypicalDefault="install" Absent="allow">\r
@@ -85,5 +87,15 @@ DO NOT INSTALL THIS FEATURE if you don't use VS.NET with Web Projects!!!"
                        </Feature>\r
                        <?endif ?>\r
 \r
+               \r
+               <Feature  Id="SSHPlink" Level="1" Title="SSH Plink" Description="SSH PLink" TypicalDefault="install" Display="hidden" InstallDefault="followParent">\r
+                               <ComponentRef  Id="C_SSHCLIENT_PLINK"/>\r
+               </Feature>\r
+               \r
+                       \r
+               <Feature  Id="SSHOpenSSH" Level="1" Title="SSH OpenSSH" Description="SSH OpenSSH" TypicalDefault="install" Display="hidden" InstallDefault="followParent">\r
+                               <ComponentRef  Id="C_SSHCLIENT_OPENSSH"/>\r
                </Feature>\r
+               \r
+               </Feature>      \r
 </Include>
\ No newline at end of file