diff options
author | Andras Timar <atimar@suse.com> | 2012-07-18 21:52:10 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-07-18 21:54:03 +0200 |
commit | 8b749cb16dde14b199a61456741b586ddd88a584 (patch) | |
tree | 75fed80cec76aedb250436bc2a099eb28a758c84 /scp2 | |
parent | smoketest: produce a better errror message when Java component fails (diff) | |
download | core-8b749cb16dde14b199a61456741b586ddd88a584.tar.gz core-8b749cb16dde14b199a61456741b586ddd88a584.zip |
fdo#50584 bundle MS Visual C++ 2010 Runtime so LO can work with JRE7
Change-Id: If22bed6728121ec66ecd89ad4f869e980aeb79b7
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/vc_redist.scp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 5ec433cf2b3d..265a59567fa1 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -36,6 +36,13 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 ComponentCondition = "VC_REDIST=1"; End +MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86 + Feature = gm_Root; + Name = "Microsoft_VC100_CRT_x86.msm"; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 Feature = gm_Root; Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; |