[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - solenv/inc

[René Engelhard]

 solenv/inc/minor.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c5a52491e86b6a44797bbb593916e826feca4ece
Merge: c0f4988... 07cd2d9...
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Nov 26 17:41:11 2010 +0100

    Merge commit 'ooo/OOO330_m17' into libreoffice-3-3

diff --cc solenv/inc/minor.mk
index 80c9d76,98281ac..6e5dd9b
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
  RSCVERSION=330
- RSCREVISION=330m15(Build:1)
 -RSCREVISION=330m17(Build:9551)
 -BUILD=9551
++RSCREVISION=330m17(Build:1)
 +BUILD=1
- LAST_MINOR=m16
+ LAST_MINOR=m17
  SOURCEVERSION=OOO330
commit 07cd2d96621827511bafa4f42f49cd0f7e68c2eb
Author: Kurt Zenker <kz at openoffice.org>
Date:   Tue Nov 23 17:46:25 2010 +0100

    OOO330

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 6b22483..98281ac 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m16(Build:9549)
-BUILD=9549
-LAST_MINOR=m16
+RSCREVISION=330m17(Build:9551)
+BUILD=9551
+LAST_MINOR=m17
 SOURCEVERSION=OOO330