Jan Holesovsky e3d5d7185d Merge remote-tracking branch 'origin/libreoffice-3-4' ... Conflicts: Makefile.in bootstrap.1 configure.in solenv/inc/minor.mk		2011-06-17 13:44:18 +02:00
..
inc_ooohelppack/windows/msi_templates	fix language codes: be-BY -> be, ns -> nso	2011-03-25 13:19:18 +01:00
inc_ooolangpack/windows/msi_templates	fix language codes: be-BY -> be, ns -> nso	2011-03-25 13:19:18 +01:00
inc_openoffice	fix Y coordinate in previous commit	2011-06-13 12:48:21 +02:00
inc_sdkoo/windows/msi_templates
inc_ure/windows/msi_templates
prj	Drop %_EXT% which was always empty	2011-06-03 13:30:38 +03:00
res	padded nologobanner.bmp, new size is 102x58 - fdo#33372	2011-02-01 19:19:34 +01:00
util	Merge remote-tracking branch 'origin/libreoffice-3-4'	2011-06-17 13:44:18 +02:00