Jan Holesovsky a95376174e Merge commit 'libreoffice-3.4.2.3' ... Conflicts: Makefile.in configure.in instsetoo_native/util/makefile.mk instsetoo_native/util/openoffice.lst ooo.lst.in set_soenv.in solenv/inc/minor.mk		2011-07-28 18:33:58 +02:00
..
makefile.mk	Merge commit 'libreoffice-3.4.2.3'	2011-07-28 18:33:58 +02:00
openoffice.lst	bump product version to 3.4.2-rc3, release number to 203	2011-07-25 20:06:05 +02:00
pack.lst
update.xml