office-gobmx/instsetoo_native/inc_openoffice
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
..
unix AIX uses .a for shared libs 2010-10-13 20:29:37 +01:00
windows Merge commit 'ooo/OOO330_m15' into libreoffice-3-3 2010-11-16 09:00:32 +01:00