| commit | 3f20927717a8541fe607e4227f16ff6e1a5a6e22 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Jul 2015 18:41:24 +0000 (15 11:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Jul 2015 18:41:24 +0000 (15 11:41 -0700) | ||
| tree | 3c1b6257e2eb388357316f027fd4e5a353e765f6 | treesnapshot (tar.gz zip) |
| parent | 71a8af60aeed0ae67d119eb5e0f7d3ce1b15b2b7 | commitdiff |
| parent | 34b935c01f28d34f6764f0e1140ad47e7abdde1b | commitdiff |
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
* es/osx-header-pollutes-mask-macro:
ewah: use less generic macro name
ewah/bitmap: silence warning about MASK macro redefinition
| ewah/ewok.h | diff1 | diff2 | blobhistory |
| pack-bitmap.c | diff1 | diff2 | blobhistory |