Jan Holesovsky a3a19632f4 Merge remote-tracking branch 'origin/integration/dev300_m101' ... Conflicts: bridges/source/remote/urp/urp_environment.cxx bridges/source/remote/urp/urp_propertyobject.cxx bridges/source/remote/urp/urp_reader.cxx remotebridges/source/factory/bridgefactory.cxx stoc/source/corereflection/crefl.cxx stoc/source/javavm/javavm.cxx stoc/source/simpleregistry/simpleregistry.cxx		2011-03-18 15:58:02 +01:00
..
bridges/cpp_uno	Merge remote-tracking branch 'origin/integration/dev300_m101'	2011-03-18 15:58:02 +01:00
pch	Merge commit 'ooo/DEV300_m101' into integration/dev300_m101	2011-03-08 22:29:39 -06: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