| commit | cd8c39e2f7830aed031129240a1718dedef6b5b4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 17:36:59 +0000 (11 10:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 17:36:59 +0000 (11 10:36 -0700) | ||
| tree | 8e470b8c13293fd7972d00bbdd98e900859a5bb8 | treesnapshot (tar.gz zip) |
| parent | cdead14be7932b85b1ca46f6d8e22538a731b6cd | commitdiff |
| parent | 34b935c01f28d34f6764f0e1140ad47e7abdde1b | commitdiff |
Merge branch 'es/osx-header-pollutes-mask-macro' into next
* 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 |