[Libreoffice-commits] .: 2 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 4236a3f14f6b314ce1a7658f623281ce78eb44d4
Merge: d8ab6e8... e6be5b9...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Jun 6 14:07:02 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-4'
    
    Conflicts:
    	postprocess/packcomponents/makefile.mk

commit e6be5b9a5b025f534b9c4680989128c01d3cee93
Author: Radek Doulik <rodo at novell.com>
Date:   Fri May 20 10:37:50 2011 +0200

    add sdfilt component
    
    Signed-off-by: Katarina Machalkova <kmachalkova at suse.cz>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Fridrich Strba <fstrba at novell.com>

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1a60d20..82ff84d 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -152,6 +152,7 @@ my_components = \
     sdbc2 \
     sdbt \
     sdd \
+    sdfilt \
     simplecanvas \
     slideshow \
     $(SM_COMPONENTS)\