[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 b7a2e7223f257e305b366123c59104dd44561bd7
Merge: 4b70814... 066088e...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 11 18:09:59 2010 +0100

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

diff --cc solenv/inc/minor.mk
index e635e0c,aed4bf7..c6e863e
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
  RSCVERSION=330
- RSCREVISION=330m13(Build:1)
 -RSCREVISION=330m14(Build:9542)
 -BUILD=9542
++RSCREVISION=330m14(Build:1)
 +BUILD=1
- LAST_MINOR=m12
+ LAST_MINOR=m14
  SOURCEVERSION=OOO330
commit 066088ef313f136a54273075a691e71a9b7a0552
Author: Kurt Zenker <kz at openoffice.org>
Date:   Sat Nov 6 17:01:50 2010 +0100

    OOO330

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 6992bb5..aed4bf7 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m13(Build:9539)
-BUILD=9539
-LAST_MINOR=m13
+RSCREVISION=330m14(Build:9542)
+BUILD=9542
+LAST_MINOR=m14
 SOURCEVERSION=OOO330