strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/svx
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
..
doc Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
inc FIX BUG 32559 2011-03-21 13:35:58 +00:00
prj Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
qa/unoapi Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
sdi FIX BUG 32559 2011-03-21 13:35:58 +00:00
source Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:26 +01:00
uiconfig/layout Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
util Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
workben Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:49:47 +01:00
xml Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
AllLangResTarget_about.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
AllLangResTarget_gal.mk Fix typo in gallery makefile 2011-03-18 17:35:16 +01:00
AllLangResTarget_ofa.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
AllLangResTarget_svx.mk Sprinkle some realpath goodness here, too 2011-03-18 17:35:16 +01:00
AllLangResTarget_textconversiondlgs.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
JunitTest_svx_unoapi.mk gnumake3: convert some dmake files for tests to gbuild 2011-02-01 19:21:09 +01:00
Library_svx.mk Sprinkle some realpath goodness here, too 2011-03-18 17:35:16 +01:00
Library_svxcore.mk Sprinkle some realpath goodness here, too 2011-03-18 17:35:16 +01:00
Library_textconversiondlgs.mk Sprinkle some realpath goodness here, too 2011-03-18 17:35:16 +01:00
Makefile Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
Module_svx.mk fix mis-merge all-around. 2011-03-12 18:57:32 -06:00
Package_inc.mk re-add linkwarn, used by impress 2011-03-13 05:34:24 -05:00
Package_sdi.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00