Commit graph

5 commits

Author SHA1 Message Date
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
Ingo Schmidt
4045178053 native346 #i115376# making update process more flexible 2010-11-09 13:25:59 +01:00
Fridrich Štrba
0e4c8011b2 LibreOffice Branding: first cut 2010-09-28 08:44:06 +02:00
Rüdiger Timm
f300681434 INTEGRATION: CWS native188_DEV300 (1.2.28); FILE MERGED
2008/08/22 16:49:30 is 1.2.28.1: #i93032# new win registry layers for all products
2008-08-27 10:49:44 +00:00
Rüdiger Timm
300a0598b1 INTEGRATION: CWS jsc21 (1.1.2); FILE ADDED
2008/07/04 06:58:17 jsc 1.1.2.1: #i88797# rework optional SDK
2008-07-11 13:10:24 +00:00