distro-configs/LibreOfficeLinux.conf | 1 +
distro-configs/LibreOfficeWin32.conf | 1 +
distro-configs/LibreOfficeWin64.conf | 1 +
3 files changed, 3 insertions(+)
New commits:
commit 28b45035dbd16a34af54909fd4823f7e201bb3a2
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Fri Jul 17 16:28:24 2015 +0200
Linux and Win builds use mergelibs starting with 5.0
(cherry picked from commit 094f894bace181708bc5c826f86c9a8e9f126675)
Change-Id: I7cdcdcbbbbdc4ba44b3fb8014f93cc522b61f5fc
diff --git a/distro-configs/LibreOfficeLinux.conf
b/distro-configs/LibreOfficeLinux.conf
index 2ab94d4..fcd7746 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -36,3 +36,4 @@
--disable-gio
--disable-randr-link
--disable-kde4
+--enable-mergelibs
diff --git a/distro-configs/LibreOfficeWin32.conf
b/distro-configs/LibreOfficeWin32.conf
index fac9864..c231ccd 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -11,3 +11,4 @@
--with-help
--with-myspell-dicts
--with-package-format=msi
+--enable-mergelibs
diff --git a/distro-configs/LibreOfficeWin64.conf
b/distro-configs/LibreOfficeWin64.conf
index 5fa640d..cc8211f 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -12,3 +12,4 @@
--with-help
--with-myspell-dicts
--with-package-format=msi
+--enable-mergelibs
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
