diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2017-01-06 22:04:17 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2017-01-07 08:43:44 +0000 |
| commit | 252e42cb5448f40c4bb26dbdf732168ff466b8ea (patch) | |
| tree | 23dbb8f593f719e4231a7cc56d211cf3d3fe0f41 /scp2 | |
| parent | 1274efb0a18aef50c78ca07997572a8f2b7145c7 (diff) | |
Clean up stale merge modules
Change-Id: I2489238d5295650a3c51581a037185440f641005
Reviewed-on: https://gerrit.libreoffice.org/32797
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 22 |
1 files changed, 0 insertions, 22 deletions
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 |