Jan Holesovsky 3b7ab82aee Merge commit 'ooo/DEV300_m103' ...

Conflicts:
	basic/source/runtime/makefile.mk
	basic/source/runtime/step2.cxx
	desktop/prj/build.lst
	desktop/source/app/app.cxx
	desktop/source/deployment/registry/dp_backend.cxx
	drawinglayer/source/attribute/fontattribute.cxx
	editeng/inc/editeng/fontitem.hxx
	editeng/source/editeng/edtspell.cxx
	editeng/source/misc/svxacorr.cxx
	framework/inc/services/substitutepathvars.hxx
	framework/source/services/substitutepathvars.cxx
	sfx2/qa/cppunit/makefile.mk
	sfx2/source/doc/SfxDocumentMetaData.cxx
	sfx2/source/doc/objxtor.cxx
	svx/source/dialog/svxruler.cxx
	sysui/desktop/icons/so9_base_app.ico
	sysui/desktop/icons/so9_calc_app.ico
	sysui/desktop/icons/so9_draw_app.ico
	sysui/desktop/icons/so9_impress_app.ico
	sysui/desktop/icons/so9_main_app.ico
	sysui/desktop/icons/so9_math_app.ico
	sysui/desktop/icons/so9_writer_app.ico
	xmlhelp/source/cxxhelp/provider/databases.cxx
	xmlhelp/source/cxxhelp/provider/db.cxx
	xmlhelp/source/cxxhelp/provider/db.hxx

2011-03-23 16:59:26 +01:00

..

com/sun/star/script/framework

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:59:26 +01:00

Framework/com/sun/star/script/framework/security

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

org/openoffice

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

build.env

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

build.xml

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

makefile.mk

sb129: #i113189# change UNO components to use passive registration

2010-09-10 13:10:07 +02:00

manifest.mf

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

ScriptFramework.component

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

ScriptProviderForBeanShell.component

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

ScriptProviderForJava.component

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

ScriptProviderForJavaScript.component

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00