Conflicts:
	basic/source/app/app.cxx
	basic/source/runtime/iosys.cxx
	desktop/unx/source/start.c
	sfx2/source/appl/appdata.cxx
	sfx2/source/appl/appinit.cxx
	sfx2/source/inc/appdata.hxx
	svx/AllLangResTarget_svx.mk
	sysui/desktop/productversion.mk
	sysui/desktop/share/makefile.mk