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 | a4696d85343509443e7c20e1fd88dcc091a5efac (patch) | |
| tree | 39c637c64638a424d52cece116f2894ef6af7de9 /solenv/inc/minor.mk | |
| parent | ad3fab9cda307068ae4879d279960bbde893fe67 (diff) | |
| parent | 83a81e0c58326f481c74b9c957d41539124b6643 (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 88bd80c97..a830ab93a 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 |