diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-16 09:00:32 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-16 09:00:32 +0100 |
| commit | 71a43f77ada6e6091b065dd3eeb10493794bd083 (patch) | |
| tree | 2dccd312662622996eeaba0129d0142d37c8e57b /instsetoo_native/inc_sdkoo | |
| parent | 4a7b487b11e0968fbda6138cf5379f4d26134a87 (diff) | |
| parent | 9a29bc269126e8f37fcbdd5cbcffc359d536df78 (diff) | |
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
Diffstat (limited to 'instsetoo_native/inc_sdkoo')
| -rw-r--r-- | instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt | 2 | ||||
| -rw-r--r-- | instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt index 41ff1521764a..9a3dac51143c 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt @@ -2,4 +2,6 @@ Property Signature_ s72 s72 AppSearch Property Signature_ INSTALLLOCATION basisinstalluser +INSTALLLOCATION basisinstalluser_ INSTALLLOCATION basisinstallmachine +INSTALLLOCATION basisinstallmachine_ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt index d2b233364f98..995f919993eb 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt @@ -1,5 +1,7 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ -basisinstalluser 1 Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstallmachine 2 Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstalluser 1 Software\LibreOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstalluser_ 1 Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstallmachine 2 Software\LibreOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstallmachine_ 2 Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 |