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 | f434fd6de1a5986477e6347f3e10432d73da158b (patch) | |
| tree | 06639f5f28a5f5cc226efb2f52303fe155d9b974 | |
| parent | 5312462b3b3312dde1f9bacb59c320f69c13c3e1 (diff) | |
| parent | 4511a60b4cb155a50b3b6abace145a3a5bc76b54 (diff) | |
Merge commit 'ooo/OOO330_m18' into libreoffice-3-3
Conflicts:
solenv/inc/minor.mk
| -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 8316e6e7b..c688f69ff 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 |