[Libreoffice-commits] core.git: scp2/source

[David Ostrovsky]

 scp2/source/ooo/vc_redist.scp |   22 ----------------------
 1 file changed, 22 deletions(-)

New commits:
commit 252e42cb5448f40c4bb26dbdf732168ff466b8ea
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Fri Jan 6 22:04:17 2017 +0100

    Clean up stale merge modules
    
    Change-Id: I2489238d5295650a3c51581a037185440f641005
    Reviewed-on: https://gerrit.libreoffice.org/32797
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 23214f0..8f21124 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -18,28 +18,6 @@
 
 #include "macros.inc"
 
-#if defined(WITH_VC100_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86
-    Feature = gm_Root;
-    Name = "Microsoft_VC100_CRT_x86.msm";
-    RootDir = "TARGETDIR";
-    ComponentCondition = "VC_REDIST=1";
-End
-
-#endif
-
-#if defined(WITH_VC110_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC110_CRT_x86
-    Feature = gm_Root;
-    Name = "Microsoft_VC110_CRT_x86.msm";
-    RootDir = "TARGETDIR";
-    ComponentCondition = "VC_REDIST=1";
-End
-
-#endif
-
 #if defined(WITH_VC120_REDIST)
 
 #if defined WINDOWS_X64