diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:46:20 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:46:20 +0200 |
| commit | 9aad9cf77f93f6a689731972d97f2acc04527422 (patch) | |
| tree | cf79102596e03d339b8429fd5545410b16292870 /framework/Library_fwk.mk | |
| parent | fde37c1a38273e7a90bb6d26cd1c948e8fe63783 (diff) | |
| parent | a019d3e3c180b0ec41e2725e7cfe442afccf9cb0 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
basic/source/classes/sbunoobj.cxx
basic/source/inc/runtime.hxx
basic/source/runtime/step1.cxx
desktop/source/deployment/dp_services.cxx
drawinglayer/prj/d.lst
drawinglayer/source/primitive2d/makefile.mk
sfx2/source/appl/appinit.cxx
sfx2/source/appl/appquit.cxx
sfx2/source/inc/appdata.hxx
sfx2/source/view/viewfrm.cxx
svx/source/fmcomp/gridctrl.cxx
vbahelper/source/vbahelper/vbahelper.cxx
Diffstat (limited to 'framework/Library_fwk.mk')
| -rw-r--r-- | framework/Library_fwk.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 948af2325d..fc6fb1fce5 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -182,6 +182,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/uifactory/windowcontentfactorymanager \ framework/source/xml/acceleratorconfigurationreader \ framework/source/xml/acceleratorconfigurationwriter \ + framework/source/xml/imagesconfiguration \ + framework/source/xml/imagesdocumenthandler \ )) # vim: set noet sw=4 ts=4: |