[Libreoffice-commits] .: 5 commits - postprocess/packcomponents

[Petr Mladek]

 postprocess/packcomponents/makefile.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d78bafbfc31fca433108342ac5daa6c017cddb28
Merge: d0a158c... 07398df...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 6 19:25:25 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-4'

commit 07398dfb67961667b1441c12660984d28801f8e4
Merge: e4ce96e... cea99ea...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 5 17:34:48 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4

commit e4ce96ef9fe339be870a070ee7a074f1e83c5f37
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Apr 1 22:32:41 2011 +0100

    register lwp / wpg / msworks filter components

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 59652cc..0f97b77 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -123,9 +123,11 @@ my_components = \
     lnth \
     localebe1 \
     log \
+    lwpfilter \
     mcnttype \
     migrationoo2 \
     msfilter \
+    msworksfilter \
     mysql \
     odbc \
     odfflatxml \
@@ -181,6 +183,7 @@ my_components = \
     vcl \
     vclcanvas \
     wpft \
+    wpgfilter \
     writerfilter \
     xcr \
     xmlfa \
commit a61e8bbdff667d0f8d8efbdf5e144be6a457d2a3
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 1 15:13:16 2011 +0200

    Branch libreoffice-3-4
    
    This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases
    
        + only bug fixes are allowed
        + no approval needed during beta phase (two weeks after branch)
        + 1 approval needed during rc phase and for bugfix releases
        + 2 approvals with different/no affiliation needed for late features
        + regularly merged into master by a selected person when living
    
    Please watch http://wiki.documentfoundation.org/ReleasePlan
    and read announces on libreoffice at lists.freedesktop.org
    
    If you want to build something cool, unstable, and risky, use master.
commit cea99eac8bb9d21db96ffc0889659fb46cf4bd54
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 8 15:31:13 2011 +0100

    Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)