Jan Holesovsky 71a43f77ad Merge commit 'ooo/OOO330_m15' into libreoffice-3-3 ... Conflicts: instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt solenv/inc/minor.mk		2010-11-16 09:00:32 +01:00
..
windows/msi_templates	Merge commit 'ooo/OOO330_m15' into libreoffice-3-3	2010-11-16 09:00:32 +01:00