Merge branch 'es/osx-header-pollutes-mask-macro'
* es/osx-header-pollutes-mask-macro: ewah: use less generic macro name ewah/bitmap: silence warning about MASK macro redefinition
Junio C Hamano committed
Jun 24, 2015 at 12:21 UTC
6da9f888daab2d18c1e5ae8252f631d38fb80e8a
No changes.