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
Junio C Hamano committed
Jul 15, 2015 at 11:41 UTC
3f20927717a8541fe607e4227f16ff6e1a5a6e22
No changes.