Merge branch 'js/nedmalloc-gcc6-warnings'
commitffdcac4bc59a58fd0c4b99ce2d92c828c5b5fcae
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:42 +0000 (8 14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:43 +0000 (8 14:48 -0700)
tree01e383f92f1d88dfd18db94887a09f659ba3b65e
parent17501ba1cd56d4774e59c797bc048ee813dee235
parentc6c9e1885c9025f2e4074105e4fbe9b008e5d1a3
Merge branch 'js/nedmalloc-gcc6-warnings'

Squelch compiler warnings for netmalloc (in compat/) library.

* js/nedmalloc-gcc6-warnings:
  nedmalloc: work around overzealous GCC 6 warning
  nedmalloc: fix misleading indentation