Conflicts:
	desktop/source/app/app.cxx
	desktop/source/app/dispatchwatcher.cxx
	desktop/unx/source/splashx.c
	sfx2/Library_qstart.mk
	sfx2/Library_sfx.mk
	sfx2/source/bastyp/fltfnc.cxx