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 | 9df8682ced86258da76a730ecf354c788fffc1f2 (patch) | |
| tree | 590af31bfe3d5cfd0d4de4812a0bd696b9415d2b /drawinglayer/Library_drawinglayer.mk | |
| parent | b41941a81473b48e895ab3a30905986b029facc4 (diff) | |
| parent | a79c69155ec42ce6817980b6c875f9b39041d2d4 (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 'drawinglayer/Library_drawinglayer.mk')
| -rw-r--r-- | drawinglayer/Library_drawinglayer.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index fa9cef081166..7aab083fe94a 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -112,6 +112,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/polygonprimitive2d \ drawinglayer/source/primitive2d/polypolygonprimitive2d \ drawinglayer/source/primitive2d/primitivetools2d \ + drawinglayer/source/primitive2d/rendergraphicprimitive2d \ drawinglayer/source/primitive2d/sceneprimitive2d \ drawinglayer/source/primitive2d/sdrdecompositiontools2d \ drawinglayer/source/primitive2d/shadowprimitive2d \ |