Merge branch 'js/no-html-bypass-on-windows' into rt/help-unknown
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Aug 2016 18:29:07 +0000 (11:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Aug 2016 18:29:07 +0000 (11:29 -0700)
commit3b1c6a9b6ef3a1b26f24439436a09482a3618ff3
tree4341fdab964965970947f2eb90354cca809f5c0a
parente0c1ceafc5bece92d35773a75fff59497e1d9bd5
parent6db5967d4e6640c5a3ee3cde151c5fdde5ab508f
Merge branch 'js/no-html-bypass-on-windows' into rt/help-unknown

* js/no-html-bypass-on-windows:
  Revert "display HTML in default browser using Windows' shell API"
builtin/help.c
compat/mingw.c
compat/mingw.h