[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit 077ba37de54abcf9cbe6c6dcb276fd42c194786f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 20 15:04:12 2018 +0200

    Updated core
    Project: help  64bb1203851bc92fd5ee2acaf0d4c4babf7a6180
    
    Avoid name clash between Package and GeneratedPackage htmlcontent2_html
    
    ...by renaming the latter to htmlcontent2_html_generated.  The name clash
    happened to not cause trouble yet, but would once these packages are added to
    installation sets (i.e., once both would want to occur in
    gb_Helper_register_packages_for_install lists in Repository.mk).
    
    (Also do some minor syntactic clean up.)
    
    Change-Id: I009c154d3bb06312a9f4224b2d5feb1d9f6689fc
    Reviewed-on: https://gerrit.libreoffice.org/53208
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index f10b89e1d34a..64bb1203851b 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f10b89e1d34ab5faca7c4121dc9d1389617d1ba5
+Subproject commit 64bb1203851bc92fd5ee2acaf0d4c4babf7a6180