[Libreoffice-commits] core.git: 3 commits - configure.ac helpcontent2

[Matthew J. Francis]

 configure.ac |    3 ++-
 helpcontent2 |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 86255b6fa31fb65e31a8a3f702a58a27e76c36d2
Author: Matthew J. Francis <mjay.francis at gmail.com>
Date:   Tue Oct 28 16:10:44 2014 +0800

    Document that gtk3 support is experimental
    
    Change-Id: I87df8cb6a4e4e374c5c9782e695fcdf020d5707f
    Reviewed-on: https://gerrit.libreoffice.org/12121
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/configure.ac b/configure.ac
index 964fc5b..2796015 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1077,7 +1077,8 @@ AC_ARG_ENABLE(gtk,
 
 AC_ARG_ENABLE(gtk3,
     AS_HELP_STRING([--enable-gtk3],
-        [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]),
+        [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.
+         This is experimental and may not work.]),
 ,enable_gtk3=no)
 
 AC_ARG_ENABLE(systray,
commit 0cba83792d6b2d42a73abcf9a43a8608e175fa6b
Author: Stanislav Horacek <stanislav.horacek at gmail.com>
Date:   Tue Oct 28 17:07:23 2014 +0100

    Updated core
    Project: help  e5af8139b8a16b80a1b2398ffbeb629600484823
    
    rename Format Paintbrush to Clone Formatting
    
    Change-Id: I8d6d7094d32eb84d619a4164328401fd8584dd99
    Reviewed-on: https://gerrit.libreoffice.org/12126
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index 36a1eb4..e5af813 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 36a1eb4dcee3c27e1ed72f2af63c8ea882a38863
+Subproject commit e5af8139b8a16b80a1b2398ffbeb629600484823
commit f2b355ef62c0a06a356a43bb84e584968666c77b
Author: Stanislav Horacek <stanislav.horacek at gmail.com>
Date:   Tue Oct 28 22:20:14 2014 +0100

    Updated core
    Project: help  36a1eb4dcee3c27e1ed72f2af63c8ea882a38863
    
    related fdo#70998 rename Picture to Image
    
    Change-Id: Ie196de29cc8b2fa2d569019d18ddbd117cb33b5a
    Reviewed-on: https://gerrit.libreoffice.org/12128
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index 3019c4e..36a1eb4 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3019c4ebd3984158f2b0b0b7f9f184c48044add8
+Subproject commit 36a1eb4dcee3c27e1ed72f2af63c8ea882a38863