From 88c55621afa8ed472e8759467177a3cbb3e35735 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Sat, 29 Sep 2012 17:22:22 +0300
Subject: [PATCH] installer: remove useless define

---
 win_installer/config.wxi   | 1 -
 win_installer/cppcheck.wxs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index c3f1934f5..e3b405a40 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -9,5 +9,4 @@
   <?define TranslationsDir = "..\gui" ?>
   <?define HelpDir = "..\gui\help" ?>
   <?define QtDllDir = "..\..\runtimes" ?>
-  <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?>
 </Include>
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 953f2d101..42c14c46a 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -75,7 +75,6 @@
             <RemoveFile Id="qtsql4dll" On="install" Name="qtsql4.dll" />
           </Component>
         </Directory>
-        <!-- <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" /> -->
       </Directory>
 
       <Directory Id='ProgramMenuFolder' Name='Programs' >