diff options
author | Kurt Zenker <kz@openoffice.org> | 2004-05-19 09:47:12 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2004-05-19 09:47:12 +0000 |
commit | 6fde91a3d6f2fa67b4a57d0ec66951ae3999f651 (patch) | |
tree | 3521ec7db9d023d28759e22310d3af385307db00 | |
parent | 480023b0571a27e9a2ee3132eeb3b3f5452171ec (diff) |
INTEGRATION: CWS sdk10 (1.20.14); FILE MERGED
2004/05/17 13:56:38 mi 1.20.14.2: solved color <-> Color conflict on case insensitive file formats
2004/05/06 14:19:12 mi 1.20.14.1: #i18677# Color typedef added
-rw-r--r-- | offapi/com/sun/star/util/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/offapi/com/sun/star/util/makefile.mk b/offapi/com/sun/star/util/makefile.mk index ce0a382ed62e..81004e226d50 100644 --- a/offapi/com/sun/star/util/makefile.mk +++ b/offapi/com/sun/star/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: hr $ $Date: 2004-05-10 14:17:52 $ +# last change: $Author: kz $ $Date: 2004-05-19 10:47:12 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,7 +79,7 @@ IDLFILES=\ ChangesEvent.idl\ ChangesSet.idl \ CloseVetoException.idl\ - color.idl\ + Color.idl\ Date.idl\ DateTime.idl\ DateTimeRange.idl\ |