strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/cppcanvas
History
Jan Holesovsky 9e5584a826 Merge remote-tracking branch 'origin/integration/dev300_m106' 
Conflicts:
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	i18npool/inc/i18npool/lang.h
	i18npool/source/isolang/isolang.cxx
	svtools/source/filter/exportdialog.cxx
	svtools/source/graphic/grfmgr.cxx
	vcl/aqua/source/dtrans/aqua_service.cxx
	vcl/aqua/source/window/salframe.cxx
	vcl/inc/sft.hxx
	vcl/inc/unx/pspgraphics.h
	vcl/inc/vcl/cursor.hxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/settings.hxx
	vcl/prj/d.lst
	vcl/source/app/settings.cxx
	vcl/source/control/edit.cxx
	vcl/source/gdi/gdimtf.cxx
	vcl/source/window/cursor.cxx
	vcl/source/window/window.cxx
	vcl/unx/generic/fontmanager/fontconfig.cxx
	vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
	vcl/unx/kde4/KDESalGraphics.cxx
2011-05-27 20:47:31 +02:00
..
inc use boost rather then extstd 2011-03-12 19:02:03 -06:00
prj emf+-cppcanvas-renderer.diff: emf+ import - rendering part in cppcanvas 2010-09-15 17:54:14 +02:00
source Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:47:31 +02:00
util emf+-cppcanvas-renderer.diff: emf+ import - rendering implementation 2010-09-15 17:54:14 +02:00