summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2004-06-25 11:26:47 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2004-06-25 11:26:47 +0000
commitd62b511dd817eb597b7545e1995d3ea14ac902d8 (patch)
treed9004706cd3495c0ebf9fbe6cf96be9e55150e65
parent017baed124ad1f6646bff0d0f635962413a94282 (diff)
INTEGRATION: CWS mergebuild (1.6.10); FILE MERGED
2004/06/09 14:50:36 hjs 1.6.10.2: RESYNC: (1.6-1.7); FILE MERGED 2003/12/02 17:28:50 hjs 1.6.10.1: #i8252# change LanguageSelect to use isocodes
-rw-r--r--desktop/source/so_comp/makefile.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/desktop/source/so_comp/makefile.mk b/desktop/source/so_comp/makefile.mk
index 97b61ef21015..ed93e218b6e8 100644
--- a/desktop/source/so_comp/makefile.mk
+++ b/desktop/source/so_comp/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
-# last change: $Author: rt $ $Date: 2004-06-03 16:34:41 $
+# last change: $Author: hjs $ $Date: 2004-06-25 12:26:47 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,7 +71,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-.INCLUDE : $(UPD)minor.mk
RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR))
# --- Define time bomb date. Not active for OOo --------------------