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

..

certificatechooser.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

certificatechooser.src

CWS changehid: generate former auto hids into src files

2010-10-11 17:56:12 +02:00

certificateviewer.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

certificateviewer.src

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

dialogs.hrc

get this to build again

2010-11-16 16:57:17 +00:00

digitalsignaturesdialog.cxx

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

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

digitalsignaturesdialog.hrc

changefileheader2: #i10000#: convert files with CR/LF characters to CR only

2010-02-12 16:56:44 +01:00

digitalsignaturesdialog.src

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

helpids.hrc

CWS changehid: #i111874#: change code to support HelpIds as byte strings

2010-07-10 18:21:24 +02:00

macrosecurity.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

macrosecurity.src

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-09 16:20:50 -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

resourcemanager.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

resourcemanager.hxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

stbcontrl.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

warnings.cxx

Remove 'added by' comments

2011-03-05 16:45:26 +00:00

warnings.src

CWS changehid: generate former auto hids into src files

2010-10-11 17:56:12 +02:00