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/prj | |
parent | fdo#37001 - updated license information (diff) | |
parent | vbahelper builds after the m106 merge. (diff) | |
download | core-9df8682ced86258da76a730ecf354c788fffc1f2.tar.gz core-9df8682ced86258da76a730ecf354c788fffc1f2.zip |
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/prj')
-rw-r--r-- | drawinglayer/prj/d.lst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst index e69de29bb2d1..e8c0ccc6e5c4 100644 --- a/drawinglayer/prj/d.lst +++ b/drawinglayer/prj/d.lst @@ -0,0 +1,2 @@ + +..\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx
\ No newline at end of file |