summaryrefslogtreecommitdiff
path: root/scp2/util
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-01-18 15:33:58 +0100
committersb <sb@openoffice.org>2010-01-18 15:33:58 +0100
commit83ebf203a2bf9a6d6b75131be38c57e11aa0a680 (patch)
treea82b282206fee4933a1f4fc3b0f97d59e51ece4e /scp2/util
parent3f06a5712c384b6115a541994c48a26046929c4f (diff)
parent29215a2062903a6391d9903c2c8f47656181099d (diff)
sb119: merged in DEV300_m69
Diffstat (limited to 'scp2/util')
-rw-r--r--scp2/util/makefile.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 7fc59d932596..ead45e7bc9b7 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -129,7 +129,6 @@ SCP1FILES += \
folder_ooo.par \
folderitem_ooo.par \
windowscustomaction_ooo.par \
- mergemodules_ooo.par \
vc_redist.par \
registryitem_writer.par \
folderitem_writer.par \
@@ -283,7 +282,6 @@ SCP2FILES += \
folder_ooo.par \
folderitem_ooo.par \
windowscustomaction_ooo.par \
- mergemodules_ooo.par \
vc_redist.par \
registryitem_writer.par \
folderitem_writer.par \