diff options
| author | Andras Timar <atimar@suse.com> | 2012-07-18 21:52:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-10 11:40:11 +0200 |
| commit | 76876f51796cb10e3b4fbaa7cfaa209ab6b9fd2f (patch) | |
| tree | aaf7dbda5cd1ef000b23ea730ab32dedaa2ed3df /scp2 | |
| parent | a5d8d122dbef5c33f65d9e667989936a940b66de (diff) | |
fdo#50584 bundle MS Visual C++ 2010 Runtime so LO can work with JRE7
(cherry picked from master commit 8b749cb16dde14b199a61456741b586ddd88a584 plus
238eba337cedda17a9ed1ce7e91755c66446195a "make the vc2010 redist optional" to
libreoffice-3-6 as 6a59a378f6d492aad09ae254a024983eb9ee8060, cherry-picked to
libreoffice-3-5 from there)
Conflicts:
oowintool
Change-Id: If22bed6728121ec66ecd89ad4f869e980aeb79b7
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
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"; |