[Libreoffice-commits] .: 3 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 6fe2dcd3b6628dbc39bec1d7ddec41efb86d3b63
Merge: 0e84c28... 3aa594f...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Dec 20 01:41:44 2010 +0100

    Merge commit 'libreoffice-3.3.0.2'

commit 3aa594f13b4406dae9ce902a33fee5d5720953ab
Author: Petr Mladek <pmladek at suse.cz>
Date:   Sat Dec 18 20:35:17 2010 +0100

    Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2)
commit 9ec32790e71f54ecffea944a794703077b13f841
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 1 12:50:14 2010 +0000

    fdo#32007# Only register EvolutionLocal when evolution support is enabled
    (cherry picked from commit 16357d4555f513a0ecb987a318eff190cc845ef9)

diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index a688178..335639d 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -326,6 +326,7 @@ MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu
 .END
 .IF "$(ENABLE_EVOAB2)" == "TRUE"
 MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 .END
 .IF "$(SOLAR_JAVA)" == "TRUE"
 MY_FILES_main += \