From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Aug 2016 18:55:31 +0000 (-0700)
Subject: Merge branch 'js/nedmalloc-gcc6-warnings' into maint
X-Git-Tag: v2.9.3~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05a6d0e9d08995378e7a37048d60fbae428106fb;p=thirdparty%2Fgit.git

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
---

05a6d0e9d08995378e7a37048d60fbae428106fb