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
..
complex	Merge branch 'master' into feature/gnumake4	2011-06-20 09:48:41 +02:00
core	restore Test-BigPtrArray unit test	2011-06-13 13:09:44 +01:00
unoapi	meged from outgoing [hg:e7087a952a92]	2011-06-17 15:23:55 +02:00