From: Junio C Hamano Date: Wed, 15 Jul 2015 18:41:24 +0000 (-0700) Subject: Merge branch 'es/osx-header-pollutes-mask-macro' into maint X-Git-Tag: v2.4.6~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3f20927717a8541fe607e4227f16ff6e1a5a6e22 Merge branch 'es/osx-header-pollutes-mask-macro' into maint * es/osx-header-pollutes-mask-macro: ewah: use less generic macro name ewah/bitmap: silence warning about MASK macro redefinition --- 3f20927717a8541fe607e4227f16ff6e1a5a6e22