strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/odk/examples/cpp
History
Jan Holesovsky 11cdc4ccc4 Merge commit 'ooo/DEV300_m103' 
Conflicts:
	odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
	odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
	odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
	odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
	odk/examples/cpp/complextoolbarcontrols/exports.cxx
	odk/examples/cpp/counter/countermain.cxx
	odk/examples/cpp/remoteclient/remoteclient.cxx
	odk/settings/settings.mk
2011-03-23 16:59:36 +01:00
..
complextoolbarcontrols Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:36 +01:00
counter Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:36 +01:00
DocumentLoader Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:36 +01:00
remoteclient Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:36 +01:00
makefile.mk changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00