office-gobmx/instsetoo_native
Jan Holesovsky 5f08d6e5a4 Merge commit 'ooo/DEV300_m103'
Conflicts:
	configure
	configure.in
	instsetoo_native/util/openoffice.lst
	set_soenv.in
	solenv/bin/cws.pl
	solenv/bin/modules/installer/simplepackage.pm
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/extensions/post_PackModule.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/installationtest.mk
	solenv/inc/minor.mk
	soltools/cpp/_eval.c
2011-03-23 16:58:44 +01:00
..
inc_broffice/windows/msi_templates/Binary Updated artwork for rc 2010-11-30 00:21:39 +01:00
inc_ooohelppack/windows/msi_templates Add a missing file 2010-12-16 11:07:29 +01:00
inc_ooolangpack/windows/msi_templates Updated artwork for rc 2010-11-30 00:21:39 +01:00
inc_openoffice Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-08 19:43:29 -06:00
inc_sdkoo/windows/msi_templates Merge commit 'ooo/OOO330_m15' into libreoffice-3-3 2010-11-16 09:00:32 +01:00
inc_ure/windows/msi_templates
prj Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-08 19:43:29 -06:00
res padded nologobanner.bmp, new size is 102x58 - fdo#33372 2011-02-01 19:19:34 +01:00
util Merge commit 'ooo/DEV300_m103' 2011-03-23 16:58:44 +01:00