strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/xmloff
History
Bjoern Michaelsen 92667c8edb Merge branch 'master' into feature/gnumake4 
Conflicts:
	connectivity/source/cpool/Zregistration.cxx
	connectivity/source/drivers/evoab/LCatalog.cxx
	connectivity/source/drivers/evoab/LColumnAlias.cxx
	connectivity/source/drivers/evoab/LColumnAlias.hxx
	connectivity/source/drivers/evoab/LColumns.cxx
	connectivity/source/drivers/evoab/LColumns.hxx
	connectivity/source/drivers/evoab/LConfigAccess.cxx
	connectivity/source/drivers/evoab/LConfigAccess.hxx
	connectivity/source/drivers/evoab/LConnection.cxx
	connectivity/source/drivers/evoab/LConnection.hxx
	connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
	connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
	connectivity/source/drivers/evoab/LDriver.cxx
	connectivity/source/drivers/evoab/LDriver.hxx
	connectivity/source/drivers/evoab/LFolderList.cxx
	connectivity/source/drivers/evoab/LFolderList.hxx
	connectivity/source/drivers/evoab/LNoException.cxx
	connectivity/source/drivers/evoab/LPreparedStatement.cxx
	connectivity/source/drivers/evoab/LPreparedStatement.hxx
	connectivity/source/drivers/evoab/LResultSet.cxx
	connectivity/source/drivers/evoab/LResultSet.hxx
	connectivity/source/drivers/evoab/LServices.cxx
	connectivity/source/drivers/evoab/LStatement.cxx
	connectivity/source/drivers/evoab/LStatement.hxx
	connectivity/source/drivers/evoab/LTable.cxx
	connectivity/source/drivers/evoab/LTable.hxx
	connectivity/source/drivers/evoab/LTables.cxx
	connectivity/source/drivers/evoab/LTables.hxx
	connectivity/source/drivers/evoab/evoab.xml
	connectivity/source/drivers/evoab/makefile.mk
	editeng/Library_editeng.mk
	framework/Library_fwe.mk
	framework/test/test.cxx
	idl/prj/d.lst
	idl/util/idlpch.cxx
	linguistic/Makefile
	linguistic/Module_linguistic.mk
	linguistic/inc/linguistic/lngdllapi.h
	linguistic/inc/linguistic/lngprophelp.hxx
	linguistic/inc/linguistic/misc.hxx
	linguistic/prj/build.lst
	linguistic/prj/d.lst
	linguistic/qa/unoapi/Test.java
	linguistic/source/grammarchecker.cxx
	linguistic/source/grammarchecker.hxx
	linguistic/source/hyphdta.cxx
	linguistic/source/lngprophelp.cxx
	linguistic/source/makefile.mk
	linguistic/source/spelldta.cxx
	sfx2/Library_qstart.mk
	sfx2/Library_sfx.mk
	sfx2/inc/sfx2/qswin32.h
	sfx2/prj/build.lst
	sfx2/qa/cppunit/makefile.mk
	xmlscript/inc/xmlscript/xcrdllapi.h
	xmlscript/prj/d.lst
	xmlscript/util/makefile.mk
2011-06-19 12:24:29 +02:00
..
dtd Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
inc Merge commit 'libreoffice-3.4.0.2' 2011-05-31 10:45:50 +02:00
prj drop bogus executable flag from idl/build/src and config files 2011-03-29 21:47:37 +01:00
qa/unoapi cleanup of unoapi test 2011-03-27 16:54:05 +02:00
source fdo#37646: Avoid crash when pasting a form control into chart. 2011-06-09 21:39:53 -04:00
util Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
xml Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
JunitTest_xmloff_unoapi.mk Merge branch 'master' into feature/gnumake4 2011-06-19 12:24:29 +02:00
Library_xo.mk Merge branch 'master' into feature/gnumake4 2011-06-19 12:24:29 +02:00
Library_xof.mk chmod -x 2011-03-17 11:05:13 +02:00
Makefile Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
Module_xmloff.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
Package_dtd.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
Package_inc.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00