Jan Holesovsky 6a75a47be7 Merge remote-tracking branch 'origin/integration/dev300_m101' ...

Conflicts:
	automation/source/communi/communi.cxx
	automation/source/server/recorder.cxx
	automation/source/server/server.cxx
	basctl/source/basicide/basobj2.cxx

2011-03-18 15:35:18 +01:00

..

certificatecontainer.cxx

cppcheck: prefer prefix variant

2011-01-01 21:10:10 +00:00

certificatecontainer.hxx

add modelines to .hxx files as well

2010-10-28 15:48:02 +01:00

documentdigitalsignatures.cxx

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:35:18 +01:00

documentdigitalsignatures.hxx

add modelines to .hxx files as well

2010-10-28 15:48:02 +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

registerservices.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-09 16:20:50 -06:00

warnbox.src

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