strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/padmin
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
..
prj
source add XComponent.hpp 2011-05-20 15:23:38 +01:00
AllLangResTarget_spa.mk
Executable_spadmin.bin.mk Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:09:06 +02:00
Library_spa.mk Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:09:06 +02:00
Makefile
Module_padmin.mk
Package_inc.mk