diff options
author | Petr Mladek <pmladek@suse.cz> | 2011-01-07 19:49:11 +0100 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2011-01-07 19:49:11 +0100 |
commit | b9a65c7279e048bdca7aed1a2cbc836cf5d82985 (patch) | |
tree | 551a84c8081e2e96ec3bdb968cc4717ce2e83b04 /solenv/inc/minor.mk | |
parent | 961abfc6f24f862d9f5dd79441eeebe9ecba1e61 (diff) | |
parent | 734a6d08ad0e414b3331d4c9dac0369798e66795 (diff) |
Merge commit 'ooo/OOO330_m19' into libreoffice-3-3
Conflicts:
solenv/inc/minor.mk
Diffstat (limited to '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 88bd80c97f05..a830ab93ac29 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m18(Build:4) +RSCREVISION=330m19(Build:4) BUILD=4 -LAST_MINOR=m18 +LAST_MINOR=m19 SOURCEVERSION=OOO330 |