office-gobmx/starmath/qa
Bjoern Michaelsen 2850da4f8c Merge branch 'master' into feature/gnumake4
Conflicts:
	starmath/JunitTest_sm_unoapi.mk
	starmath/Library_sm.mk
	starmath/Library_smd.mk
	starmath/Makefile
	starmath/prj/build.lst
	starmath/prj/makefile.mk
	starmath/qa/unoapi/Test.java
	starmath/source/detreg.cxx
	starmath/source/register.cxx
	starmath/source/smdetect.cxx
	sw/Library_sw.mk
	sw/Library_swd.mk
	sw/Library_swui.mk
	sw/Library_vbaswobj.mk
	sw/inc/iodetect.hxx
	sw/inc/swddllapi.h
	sw/source/filter/basflt/iodetect.cxx
2011-06-20 09:48:41 +02:00
..
cppunit
unoapi