INTEGRATION: CWS nativefixer1 (1.7.124); FILE MERGED

2004/11/01 12:38:26 is 1.7.124.2: #i35930# introducing regmerge
2004/10/28 14:57:11 is 1.7.124.1: #i30597# adding database menu item
This commit is contained in:
Oliver Bolte 2004-11-18 08:01:51 +00:00
parent b5680964ae
commit 25dfec54c6

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.10 $
# $Revision: 1.11 $
#
# last change: $Author: obo $ $Date: 2004-11-17 13:02:10 $
# last change: $Author: obo $ $Date: 2004-11-18 09:01:51 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -82,7 +82,6 @@ SCP1FILES = installation_ooo.par \
scpaction_ooo.par \
helptext_ooo.par \
directory_ooo.par \
starregistry_ooo.par \
datacarrier_ooo.par \
file_ooo.par \
file_extra_ooo.par \
@ -140,6 +139,7 @@ SCP1FILES += \
SCP1FILES += \
registryitem_ooo.par \
folder_ooo.par \
folderitem_ooo.par \
registryitem_writer.par \
folderitem_writer.par \
registryitem_calc.par \