<Feature Id="DefaultFeature" Level="1" ConfigurableDirectory="INSTALLDIR" Title="TortoiseGit" Absent="disallow"\r
TypicalDefault="install" Description="The TortoiseGit package and dependencies." Display="expand" InstallDefault="local" >\r
<ComponentRef Id="C__infofiles" />\r
-<!-- <ComponentRef Id="C__apr" />\r
- <ComponentRef Id="C__sasl" />\r
- <ComponentRef Id="C__gettext" />\r
--->\r
+ <ComponentRef Id="C__apr" />\r
+<!-- <ComponentRef Id="C__sasl" />\r
+--> <ComponentRef Id="C__gettext" />\r
+\r
<ComponentRef Id="C__help_en" />\r
+ <ComponentRef Id="C__wingit" />\r
<ComponentRef Id="C__TortoiseSVN" />\r
<ComponentRef Id="C__TortoiseSVNShortcuts" />\r
-<!-- <ComponentRef Id="C__TortoiseMerge" />\r
+ <ComponentRef Id="C__TortoiseMerge" />\r
<ComponentRef Id="C__TortoiseMergeShortcuts" />\r
- <ComponentRef Id="C__TortoiseBlame" />\r
- <ComponentRef Id="C__TortoiseIDiff" />\r
+ \r
+ <ComponentRef Id="C__TortoiseBlame" />\r
+<!-- \r
+ <ComponentRef Id="C__TortoiseIDiff" />\r
<ComponentRef Id="C__TortoiseIDiffShortcuts" />\r
-->\r
<ComponentRef Id="C__TortoiseUDiff" />\r
<ComponentRef Id="C__PlatformSettingsShortcuts" />\r
<ComponentRef Id="C__shellregistry" />\r
<ComponentRef Id="C__machineregistry" />\r
- <ComponentRef Id="C__svnprotocoll" />\r
+<!-- <ComponentRef Id="C__svnprotocoll" />\r
+-->\r
<ComponentRef Id="C__approveshellcomponents" />\r
<ComponentRef Id="C__ProgramMenuFolder" />\r
<ComponentRef Id="C__Sounds" />\r
<MergeRef Id="MFCLOC 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
<ComponentRef Id="C__TortoiseUDiffAssoc" />\r
</Feature>\r
\r
- <?if $(var.DictionaryENGB) = 1 ?>\r
+ <?if $(var.DictionaryENGB) = 1 ?>\r
<Feature Id="DictionaryENGB" Level="1" Title="English (GB) dictionary" Description="English (GB) spell checker dictionary" TypicalDefault="install" Absent="allow">\r
<ComponentRef Id="C__DictionaryENGB" />\r
</Feature>\r