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

[Jan Holesovsky]

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

New commits:
commit f434fd6de1a5986477e6347f3e10432d73da158b
Merge: 5312462... 4511a60...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Dec 14 21:28:23 2010 +0100

    Merge commit 'ooo/OOO330_m18' into libreoffice-3-3
    
    Conflicts:
    	solenv/inc/minor.mk

diff --cc solenv/inc/minor.mk
index 8316e6e,d8732bc..c688f69
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
  RSCVERSION=330
- RSCREVISION=330m17(Build:3)
 -RSCREVISION=330m18(Build:9556)
 -BUILD=9556
++RSCREVISION=330m18(Build:3)
 +BUILD=3
- LAST_MINOR=m17
+ LAST_MINOR=m18
  SOURCEVERSION=OOO330
commit 4511a60b4cb155a50b3b6abace145a3a5bc76b54
Author: Release Engineering <releng at openoffice.org>
Date:   Mon Dec 13 10:38:56 2010 +0100

    OOO330

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