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

[Petr Mladek]

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

New commits:
commit a4696d85343509443e7c20e1fd88dcc091a5efac
Merge: ad3fab9... 83a81e0...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Jan 7 19:49:11 2011 +0100

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

diff --cc solenv/inc/minor.mk
index 88bd80c,4c8eb6c..a830ab9
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
  RSCVERSION=330
- RSCREVISION=330m18(Build:4)
 -RSCREVISION=330m19(Build:9561)
 -BUILD=9561
++RSCREVISION=330m19(Build:4)
 +BUILD=4
- LAST_MINOR=m18
+ LAST_MINOR=m19
  SOURCEVERSION=OOO330
commit 83a81e0c58326f481c74b9c957d41539124b6643
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Jan 6 17:27:00 2011 +0100

    OOO330

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