diff options
author | Carsten Driesner <cd@openoffice.org> | 2010-09-14 09:44:40 +0200 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2010-09-14 09:44:40 +0200 |
commit | 19e019d20915aac266e46f677b3b882f1a9ce81b (patch) | |
tree | 4e7fc3876ac6f2a60f483417d8d4c529ccc15442 /framework/util | |
parent | b12644eb20d8153243943d22e5923e06afebd637 (diff) | |
parent | dfc90a5e05629e4ca182e8edee5948a4edcab54d (diff) |
dockingwindows: Merge changes
Diffstat (limited to 'framework/util')
-rw-r--r-- | framework/util/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 91532cda76e2..4c732e9170b4 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -336,8 +336,14 @@ SHL4OBJS= \ $(SLO)$/windowcommanddispatch.obj \ $(SLO)$/windowstateconfiguration.obj \ $(SLO)$/windowcontentfactorymanager.obj \ - $(SLO)$/startmoduledispatcher.obj - + $(SLO)$/startmoduledispatcher.obj \ + $(SLO)$/modelwinservice.obj \ + $(SLO)$/panelmanager.obj \ + $(SLO)$/panel.obj \ + $(SLO)$/helpers.obj \ + $(SLO)$/uielement.obj \ + $(SLO)$/toolbarlayoutmanager.obj + SHL4STDLIBS= \ $(FWILIB) \ $(FWELIB) \ |