strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/scp2
History
Jan Holesovsky fc1e9f253d Merge branch 'DEV300_m106' into libreoffice-3-4 
Conflicts:
	Module_ooo.mk
	Repository.mk
	configure
	configure.in
	ooo.lst
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	solenv/config/sdev300.ini
	solenv/config/ssolar.cmn
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/JavaClassSet.mk
	solenv/gbuild/JunitTest.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/Module.mk
	solenv/gbuild/Output.mk
	solenv/gbuild/SdiTarget.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/windows.mk
	solenv/gbuild/platform/winmingw.mk
	solenv/inc/minor.mk
2011-04-22 15:07:18 +02:00
..
inc Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-08 19:43:29 -06:00
macros cleanup macro.pl - re-build if your config changes 2010-10-12 22:30:55 +01:00
prj set build depencencies against the new "translations" module 2011-03-25 12:13:50 +01:00
source Merge branch 'DEV300_m106' into libreoffice-3-4 2011-04-22 15:07:18 +02:00
util Remove removed datacarrier from makefile 2011-03-18 17:35:01 +01:00