merge: default into stable for release candidate stable 5.0rc0
authorAugie Fackler <augie@google.com>
Wed, 17 Apr 2019 13:41:18 -0400
branchstable
changeset 42146 4a8d9ed86475
parent 41984 d1c33b2442a7 (diff)
parent 42143 29569f2db929 (current diff)
child 42147 807a6ca6d096
merge: default into stable for release candidate
contrib/discovery-helper.sh
contrib/python-zstandard/zstd_cffi.py
contrib/win32/mercurial.iss
contrib/win32/win32-build.txt
contrib/wix/COPYING.rtf
contrib/wix/README.txt
contrib/wix/contrib.wxs
contrib/wix/defines.wxi
contrib/wix/dist.wxs
contrib/wix/doc.wxs
contrib/wix/guids.wxi
contrib/wix/help.wxs
contrib/wix/hg.cmd
contrib/wix/i18n.wxs
contrib/wix/locale.wxs
contrib/wix/mercurial.wxs
contrib/wix/templates.wxs
tests/test-demandimport.py.out