diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-14 21:28:23 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-14 21:28:23 +0100 |
| commit | 1cff7e80d07cd291b8035a0b061d4f13f9166718 (patch) | |
| tree | aa81157986f1127bf4a3c77f817431110f29a8de /solenv | |
| parent | 684c23e0df8650864e89e8dfd0c97fdbb0d28714 (diff) | |
| parent | 74aad99c69ef0cdb694c02b3c21318166e4c6140 (diff) | |
Merge commit 'ooo/OOO330_m18' into libreoffice-3-3
Conflicts:
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 8316e6e7b974..c688f69ffa82 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m17(Build:3) +RSCREVISION=330m18(Build:3) BUILD=3 -LAST_MINOR=m17 +LAST_MINOR=m18 SOURCEVERSION=OOO330 |