add TortoiseOverlays 1.0.5.14479 msi

diff --git a/ext/TortoiseOverlays/TortoiseOverlays-win32.msi b/ext/TortoiseOverlays/TortoiseOverlays-win32.msi
new file mode 100644 (file)
index 0000000..d3e7a19
Binary files /dev/null and b/ext/TortoiseOverlays/TortoiseOverlays-win32.msi differ

diff --git a/ext/TortoiseOverlays/TortoiseOverlays-win32.msm b/ext/TortoiseOverlays/TortoiseOverlays-win32.msm
new file mode 100644 (file)
index 0000000..1b51753
Binary files /dev/null and b/ext/TortoiseOverlays/TortoiseOverlays-win32.msm differ

diff --git a/ext/TortoiseOverlays/TortoiseOverlays-x64.msi b/ext/TortoiseOverlays/TortoiseOverlays-x64.msi
new file mode 100644 (file)
index 0000000..470a58a
Binary files /dev/null and b/ext/TortoiseOverlays/TortoiseOverlays-x64.msi differ

diff --git a/ext/TortoiseOverlays/TortoiseOverlays-x64.msm b/ext/TortoiseOverlays/TortoiseOverlays-x64.msm
new file mode 100644 (file)
index 0000000..5355f2b
Binary files /dev/null and b/ext/TortoiseOverlays/TortoiseOverlays-x64.msm differ

diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi
index 106ebe2..e76d799 100644 (file)
--- a/src/TortoiseGitSetup/FeaturesFragment.wxi
+++ b/src/TortoiseGitSetup/FeaturesFragment.wxi
@@ -43,7 +43,7 @@
                                <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

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 07f2665..1767ec8 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -37,13 +37,13 @@
           <?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