diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:31:41 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:31:41 +0100 |
| commit | d856c71a7de5a89a855ab84e5c99a187675fb3e6 (patch) | |
| tree | 524da5c1452039059ff3038234eac75f63ede64b /solenv/inc | |
| parent | 91b54d2c173401ef026f4dd6c01b5aadcd150db9 (diff) | |
| parent | 3335c0b182814ef724d425b24abe3070cb4e83dc (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
configure.in
solenv/bin/build.pl
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/minor.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 88bd80c97f05..3e2745f9ddf7 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m18(Build:4) -BUILD=4 -LAST_MINOR=m18 +RSCREVISION=330m19(Build:6) +BUILD=6 +LAST_MINOR=m19 SOURCEVERSION=OOO330 |