diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:11:02 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:11:02 +0100 |
| commit | 70896c190c7d841caa40f9de8a853fa2aa44f7d3 (patch) | |
| tree | babb39c82d6ad8677e09de49f354c0b45b311045 /instsetoo_native/inc_broffice/windows | |
| parent | another 4x faster - down to ~2 seconds now for me. (diff) | |
| parent | Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) (diff) | |
| download | core-70896c190c7d841caa40f9de8a853fa2aa44f7d3.tar.gz core-70896c190c7d841caa40f9de8a853fa2aa44f7d3.zip | |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
configure.in
scp2/source/extensions/directory_extensions.scp
scp2/source/extensions/module_extensions.scp
scp2/source/ooo/file_ooo.scp
set_soenv.in
solenv/bin/modules/installer/download.pm
solenv/bin/modules/installer/helppack.pm
solenv/bin/modules/installer/windows/createfolder.pm
solenv/bin/modules/installer/worker.pm
solenv/bin/ooinstall
Diffstat (limited to 'instsetoo_native/inc_broffice/windows')
| -rw-r--r-- | instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp | bin | 7112 -> 7106 bytes |
| -rw-r--r-- | instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp | bin | 51772 -> 52242 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp Binary files differindex 9b367631b65c..84840f36a3b4 100644 --- a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp Binary files differindex 8b160e68ec8c..75dc163eb719 100644 --- a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp +++ b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp |
