<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
<?endif ?>\r
\r
<?if $(var.Platform) = "x86" ?>\r
-<!-- <Merge Id='Ovlays' Language='0' SourceFile='..\..\ext\TortoiseOverlays\TortoiseOverlays-1.0.4.11886-win32.msm' DiskId='1' />\r
- --> <?endif ?>\r
+ <Merge Id='Ovlays' Language='0' SourceFile='..\..\ext\TortoiseOverlays\TortoiseOverlays-win32.msm' DiskId='1' />\r
+ <?endif ?>\r
\r
<?if $(var.Platform) = "x64" ?>\r
- <!--\r
- <Merge Id='Ovlays' Language='0' SourceFile='..\..\ext\TortoiseOverlays\TortoiseOverlays-1.0.4.11886-x64.msm' DiskId='1' />\r
- -->\r
+ \r
+ <Merge Id='Ovlays' Language='0' SourceFile='..\..\ext\TortoiseOverlays\TortoiseOverlays-x64.msm' DiskId='1' />\r
+ \r
<?endif ?>\r
\r
<Component Id="C__infofiles" Guid="$(var.GuidInfoFiles)" Win64="$(var.Win64YesNo)">\r