From 252e42cb5448f40c4bb26dbdf732168ff466b8ea Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 6 Jan 2017 22:04:17 +0100 Subject: Clean up stale merge modules Change-Id: I2489238d5295650a3c51581a037185440f641005 Reviewed-on: https://gerrit.libreoffice.org/32797 Reviewed-by: Michael Stahl Tested-by: Jenkins --- scp2/source/ooo/vc_redist.scp | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 23214f0e2eaa..8f2112498dca 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 -- cgit