diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-06-10 15:51:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-06-10 15:51:48 +0000 |
| commit | ab5c08f14ac28a649200337e3d78c35673f4ed59 (patch) | |
| tree | e16ae341f36f1c023662f19e27d8ea92563583ef /comphelper | |
| parent | e83777e31f7a00e1b508d2601bdd28ed885d02d3 (diff) | |
INTEGRATION: CWS fwk02ea (1.23.12); FILE MERGED
2004/06/09 05:40:58 as 1.23.12.2: resolve merge conflicts
2004/05/13 09:45:40 as 1.23.12.1: #115945# new locale class with support of fallback mechanism
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/comphelper/source/misc/makefile.mk b/comphelper/source/misc/makefile.mk index 4a5da843fdac..ca64f57cb5d9 100644 --- a/comphelper/source/misc/makefile.mk +++ b/comphelper/source/misc/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # -# last change: $Author: rt $ $Date: 2004-05-07 16:28:17 $ +# last change: $Author: kz $ $Date: 2004-06-10 16:51:48 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -96,8 +96,9 @@ SLOFILES= \ $(SLO)$/proxyaggregation.obj \ $(SLO)$/anytostring.obj \ $(SLO)$/sequenceashashmap.obj \ - $(SLO)$/mediadescriptor.obj - + $(SLO)$/listenernotification.obj \ + $(SLO)$/mediadescriptor.obj \ + $(SLO)$/locale.obj # --- Targets ---------------------------------- |