Merge branch 'js/nedmalloc-gcc6-warnings' into maint
commit05a6d0e9d08995378e7a37048d60fbae428106fb
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:31 +0000 (10 11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:31 +0000 (10 11:55 -0700)
treedba5583808d2db4794064bd5e61943b522552fcf
parentf7fb6e21b8f392f97fd35da41a31078fe6641b2a
parentc6c9e1885c9025f2e4074105e4fbe9b008e5d1a3
Merge branch 'js/nedmalloc-gcc6-warnings' into maint

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

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