summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-04-20 15:04:12 +0200
committerGerrit Code Review <gerrit@gerrit.libreoffice.org>2018-04-20 15:12:21 +0200
commit077ba37de54abcf9cbe6c6dcb276fd42c194786f (patch)
treeabdc7f2444e8d664338a55e143dae1bbfa73578f
parent805da078eca4db1f54d39186f43d5dbd56b7a84b (diff)
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@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
m---------helpcontent20
1 files changed, 0 insertions, 0 deletions
diff --git a/helpcontent2 b/helpcontent2
-Subproject f10b89e1d34ab5faca7c4121dc9d1389617d1ba
+Subproject 64bb1203851bc92fd5ee2acaf0d4c4babf7a618