Jan Holesovsky f2574337db Merge commit 'ooo/DEV300_m103' ...

Conflicts:
	smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
	smoketestdoc/data/Global.xml
	smoketestdoc/data/OptionsDlg.xml
	smoketestdoc/data/Test_10er.xml
	smoketestoo_native/data/content.xml
	smoketestoo_native/makefile.mk

2011-03-23 16:59:41 +01:00

..

makefile.mk

debuglevels: #i117073# added cppunittester --protector support; added unoexceptionprotector and use it in installationtest.mk; reverted changes to smoketest.cxx obsoleted by these additions

2011-02-25 11:32:55 +01:00

unoexceptionprotector.cxx

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:59:41 +01:00