From 574d77abb0ef145b9bc87c3edaf50ea1b30e4dc5 Mon Sep 17 00:00:00 2001
From: Bryan Chin <bchin@adobe.com>
Date: Thu, 20 Feb 2014 10:10:54 -0600
Subject: [PATCH 1/2] adding MSVCRT merge module to Windows installer

---
 installer/win/Brackets.wxs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/installer/win/Brackets.wxs b/installer/win/Brackets.wxs
index 54db6da8c..458d0ea8a 100644
--- a/installer/win/Brackets.wxs
+++ b/installer/win/Brackets.wxs
@@ -101,7 +101,16 @@
             </Directory>
             <Directory Id="ProgramMenuFolder"/>
         </Directory>
-    
+        
+        <!-- add MSVCRT merge modules -->
+        <DirectoryRef Id="TARGETDIR">
+            <Merge Id="VCRedist" SourceFile="C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\microsoft.vcxx.crt.x86_msm.msm" DiskId="1" Language="0"/>
+        </DirectoryRef>
+
+        <Feature Id="VCRedist" Title="Visual C++ 8.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
+            <MergeRef Id="VCRedist"/>
+        </Feature>
+        
         <!-- Set default install location -->    
         <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
         <!-- Install Files -->

From c1ba31ed85d58a851d58d9e47843bc69545ecc62 Mon Sep 17 00:00:00 2001
From: Bryan Chin <bchin@adobe.com>
Date: Thu, 20 Feb 2014 17:38:39 -0600
Subject: [PATCH 2/2] updating to VC10 merge module to comply with build
 machine configuration

---
 installer/win/Brackets.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/win/Brackets.wxs b/installer/win/Brackets.wxs
index 458d0ea8a..1ee522b62 100644
--- a/installer/win/Brackets.wxs
+++ b/installer/win/Brackets.wxs
@@ -104,7 +104,7 @@
         
         <!-- add MSVCRT merge modules -->
         <DirectoryRef Id="TARGETDIR">
-            <Merge Id="VCRedist" SourceFile="C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\microsoft.vcxx.crt.x86_msm.msm" DiskId="1" Language="0"/>
+            <Merge Id="VCRedist" SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm" DiskId="1" Language="0"/>
         </DirectoryRef>
 
         <Feature Id="VCRedist" Title="Visual C++ 8.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">