office-gobmx/drawinglayer
Rafael Dominguez 5eb74b1fca Merge branch 'feature/template-dialog'
Conflicts:
	sfx2/Library_sfx.mk
	sfx2/inc/sfx2/sfxcommands.h
	sfx2/inc/sfx2/sfxsids.hrc
	sfx2/source/appl/appserv.cxx
	svtools/Library_svt.mk

Change-Id: I4305d81cb5fd6f5192a29f85835c78f31310b0d6
2012-07-06 05:23:43 -04:30
..
inc/drawinglayer Merge branch 'feature/template-dialog' 2012-07-06 05:23:43 -04:30
prj
source Merge branch 'feature/template-dialog' 2012-07-06 05:23:43 -04:30
Library_drawinglayer.mk Merge branch 'feature/template-dialog' 2012-07-06 05:23:43 -04:30
Makefile
Module_drawinglayer.mk
Package_inc.mk moved createBaseProcessor2DFromOutputDevice to drawinglayer module 2012-06-13 19:11:53 +02:00