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 /solenv | |
| parent | several openbsd changes to find libs and binaries (diff) | |
| parent | OOO330 (diff) | |
| download | core-71a43f77ada6e6091b065dd3eeb10493794bd083.tar.gz core-71a43f77ada6e6091b065dd3eeb10493794bd083.zip | |
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 'solenv')
| -rw-r--r-- | solenv/inc/minor.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index c6e863e5ccf0..94f8dc2c56d6 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m14(Build:1) +RSCREVISION=330m15(Build:1) BUILD=1 -LAST_MINOR=m14 +LAST_MINOR=m15 SOURCEVERSION=OOO330 |