strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/smoketestoo_native
History
Michael Meeks 8c59580b88 Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 
Conflicts:
	smoketestoo_native/data/Global.xml
	smoketestoo_native/data/OptionsDlg.xml
	smoketestoo_native/data/Test_10er.xml
	smoketestoo_native/data/content.xml
	smoketestoo_native/smoketest.cxx
	test/source/cpp/getargument.cxx
	test/source/cpp/officeconnection.cxx
	testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
	testautomation/framework/optional/includes/filedlg_cjk_folders.inc
	testautomation/global/sid/all.sid
	testautomation/global/sid/bars.sid
	testautomation/global/sid/e_all.sid
	testautomation/global/win/bars.win
	testautomation/graphics/optional/includes/impress/i_slideshow2.inc
	testautomation/graphics/optional/includes/impress/i_slideshow3.inc
	testtools/source/bridgetest/bridgetest.cxx
	testtools/source/bridgetest/constructors.cxx
	testtools/source/bridgetest/makefile.mk
	testtools/source/bridgetest/testComponent.component
2011-03-11 11:35:29 +00:00
..
com/sun/star/comp/smoketest Clean up makefiles 2011-02-01 18:02:20 +01:00
data Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-11 11:35:29 +00:00
prj smoketest26: #i112616# generate smoketestdoc.sxw 2010-06-23 13:47:42 +02:00
makefile.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-11 11:35:29 +00:00
smoketest.cxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-11 11:35:29 +00:00
version.map sb118: #i109125# change source file copyright notice from Sun Microsystems to Oracle 2010-02-25 14:34:54 +01:00