strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/l10ntools
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 revert part of 5cd163969b0958bd5812f837ff014409bf5b72ce 2011-05-16 23:50:00 +02:00
java Kill UPDMINOREXT and simplify 2011-03-30 16:03:55 +03:00
layout remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (libs-gui) 2011-04-19 20:42:51 +02:00
prj Fixed localize jpropex launcher under Win32/Cygwin 2011-01-09 00:12:29 +01:00
scripts remove support for proprietary modules (former StarOffice) 2011-05-17 22:38:56 +02:00
source Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:47:31 +02:00
workbench