[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - helpcontent2

[Zolnai Tamás]

 helpcontent2 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24aae51446a252d7655e54201d703d0c87a822e0
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sat Jan 11 22:05:05 2014 +0100

    Updated core
    Project: help  ca49962e87a88c3d3bd21bed5786150aa9e40f3d
    
    fdo#72420: Startcenter: make all helpid point to startcenter's main help page
    
    Until the specific ui elements don't have own help pages.
    With this we can avoid to open an empty help page by pushing F1 or
    clicking on Help button.
    Four ui elements' helpid is not set yet: 'Extensions' button, 'Help' button,
    recent docs view.
    
    (cherry picked from commit 0f7b9d00562b8d87d1fb12bb21555907d3f0e874)
    
    Conflicts:
    	source/text/shared/guide/startcenter.xhp
    
    Change-Id: Ic0c1bd1dba4c08fd6b3d9daf8fbc9e622a54b6f2
    Reviewed-on: https://gerrit.libreoffice.org/7396
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/helpcontent2 b/helpcontent2
index 7cf30c2..ca49962 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7cf30c2b3454e97ca342ffb655b08fe51bdaae65
+Subproject commit ca49962e87a88c3d3bd21bed5786150aa9e40f3d