diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-11 18:09:59 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-11 18:09:59 +0100 |
| commit | 986a994c2fdefc1014c190124c28458d7720778e (patch) | |
| tree | 73edf3a50c03208f2cca49e79b4f1944307b04fe /solenv/inc/minor.mk | |
| parent | 4fd9fd4b2bec254240580875618df2fcb90ae156 (diff) | |
| parent | c4ad88980fa74a5edfc670d2b158119ebc352357 (diff) | |
Merge commit 'ooo/OOO330_m14' 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 e635e0c2354e..c6e863e5ccf0 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m13(Build:1) +RSCREVISION=330m14(Build:1) BUILD=1 -LAST_MINOR=m12 +LAST_MINOR=m14 SOURCEVERSION=OOO330 |