strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/framework/inc
History
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
..
classes Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
dispatch Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
framework Add FWE_DLLPUBLIC 2011-03-17 13:36:00 +02:00
helper Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
interaction Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
jobs Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
macros Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
pch Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
recording Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
services Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:26 +01:00
tabwin Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
threadhelp Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
uiconfiguration Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
uielement Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
uifactory Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
xml Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
acceleratorconst.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
arguments.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
commands.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
dispatchcommands.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
framework.hrc Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
fwidllapi.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
fwkdllapi.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
general.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
helpid.hrc Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
loadstate.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
properties.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
protocols.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
queries.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
services.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
stdtypes.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
targets.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00