summaryrefslogtreecommitdiff
path: root/scp2/source/ooo/makefile.mk
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
commit69fe74a6e5e4b371e09a6629028f874f78cb3221 (patch)
treeea711c627c2e384b4cc38dc36c0c4ee04c589921 /scp2/source/ooo/makefile.mk
parent455ed105c38639b4c8091894cc7e8a14e38fe289 (diff)
parent571413c85a93b637606eb6ec33093a70cb840861 (diff)
sb119: merged in DEV300_m69
Diffstat (limited to 'scp2/source/ooo/makefile.mk')
-rw-r--r--scp2/source/ooo/makefile.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index d72ee378f..652eeef99 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -297,7 +297,6 @@ PARFILES += \
folder_ooo.par \
folderitem_ooo.par \
registryitem_ooo.par \
- mergemodules_ooo.par \
vc_redist.par \
windowscustomaction_ooo.par
.ENDIF