strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/unotools
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 Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:47:31 +02:00
prj Fix gbuildize unotools 2011-04-03 11:19:43 +02:00
qa/complex/tempfile migrate unotools subsequenttests to gbuild 2011-03-28 00:28:26 +02:00
source Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:47:31 +02:00
util gbuildize unotools 2011-04-03 10:56:22 +02:00
JunitTest_unotools_complex.mk convert leading tab to spaces 2011-04-03 19:25:33 +02:00
Library_utl.mk Kill BrOffice, fdo#36262 2011-04-26 13:53:37 +03:00
Makefile migrate unotools subsequenttests to gbuild 2011-03-28 00:28:26 +02:00
Module_unotools.mk convert leading tab to spaces 2011-04-03 19:25:33 +02:00
Package_inc.mk add vim modelines 2011-04-03 18:31:54 +02:00