diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:09:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:09:03 +0000 |
| commit | 881aa9d39defefc5f8a72f689d6b773d48adb023 (patch) | |
| tree | 344a9a06f8040d08f1a58707d50298c452539cba /framework/util/makefile.mk | |
| parent | 2a2879630619b402ad3250fa43f774b8e81fe973 (diff) | |
INTEGRATION: CWS c06 (1.97.32); FILE MERGED
2005/09/27 05:41:33 as 1.97.32.2: #i53536# new helper to prevent duplicate interactions during same transaction
2005/08/23 12:34:55 cd 1.97.32.1: #i53493# Make toolbar state globally custimizable
Diffstat (limited to 'framework/util/makefile.mk')
| -rw-r--r-- | framework/util/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index d144ead6fb44..4da02a4cd657 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.98 $ +# $Revision: 1.99 $ # -# last change: $Author: rt $ $Date: 2005-09-09 02:08:44 $ +# last change: $Author: rt $ $Date: 2005-11-11 12:09:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -105,7 +105,8 @@ LIB2OBJFILES= $(SLO)$/attributelist.obj \ $(SLO)$/uielementwrapperbase.obj \ $(SLO)$/uiconfigelementwrapperbase.obj \ $(SLO)$/configimporter.obj \ - $(SLO)$/menuextensionsupplier.obj + $(SLO)$/menuextensionsupplier.obj \ + $(SLO)$/preventduplicateinteraction.obj # --- import classes library --------------------------------------------------- @@ -312,7 +313,8 @@ SHL4OBJS= \ $(SLO)$/sessionlistener.obj \ $(SLO)$/newmenucontroller.obj \ $(SLO)$/logoimagestatusbarcontroller.obj \ - $(SLO)$/logotextstatusbarcontroller.obj + $(SLO)$/logotextstatusbarcontroller.obj \ + $(SLO)$/globalsettings.obj SHL4STDLIBS= \ $(FWILIB) \ |