summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2011-10-21 10:36:45 +0200
committerAndras Timar <atimar@suse.com>2011-11-16 15:50:43 +0100
commitfa3495bfdaa10569580f041a6b8bd1c2fc51c0ff (patch)
treee95ca40a8fa2666da167af28dea48dd216a59154 /scp2
parent1ed7b50b43c21f866e332e9e2b059e2b3804f627 (diff)
add merge modules to scp2
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/vc_redist.scp24
1 files changed, 24 insertions, 0 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 5c5c557b4611..c4989a99fdee 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -41,4 +41,28 @@ ScpAction scp_Copy_vcredist_x64
Subdir = "redist";
End
+MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
+ Feature = gm_Root;
+ Name = "Microsoft_VC90_CRT_x86.msm";
+ RootDir = "TARGETDIR";
+End
+
+MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
+ Feature = gm_Root;
+ Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
+ RootDir = "TARGETDIR";
+End
+
+MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64
+ Feature = gm_Root;
+ Name = "Microsoft_VC90_CRT_x86_x64.msm";
+ RootDir = "TARGETDIR";
+End
+
+MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64
+ Feature = gm_Root;
+ Name = "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm";
+ RootDir = "TARGETDIR";
+End
+
#endif