strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/connectivity/qa
History
Jan Holesovsky b6212a4a95 Merge remote-tracking branch 'origin/libreoffice-3-4' 
Conflicts:
	connectivity/qa/makefile.mk
	sfx2/source/appl/appdata.cxx
	sfx2/source/appl/appinit.cxx
	sfx2/source/inc/appdata.hxx
	sysui/desktop/productversion.mk
	xmloff/source/forms/elementimport.cxx
2011-06-06 14:06:48 +02:00
..
complex/connectivity Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
connectivity/tools Merge commit 'ooo/DEV300_m106' into integration/dev300_m106 2011-04-28 00:12:58 +02:00
makefile.mk Merge remote-tracking branch 'origin/libreoffice-3-4' 2011-06-06 14:06:48 +02:00
scenarios.sce Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00