Merge branch 'es/osx-header-pollutes-mask-macro' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 18:41:24 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 18:41:24 +0000 (11:41 -0700)
* es/osx-header-pollutes-mask-macro:
  ewah: use less generic macro name
  ewah/bitmap: silence warning about MASK macro redefinition

1  2 
ewah/ewok.h
pack-bitmap.c

diff --cc ewah/ewok.h
Simple merge
diff --cc pack-bitmap.c
Simple merge