| commit | 6da9f888daab2d18c1e5ae8252f631d38fb80e8a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Jun 2015 19:21:44 +0000 (24 12:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Jun 2015 19:21:44 +0000 (24 12:21 -0700) | ||
| tree | 4a99ad47fa7522e2805c3bbf8b631bbd823eef5e | treesnapshot (tar.gz zip) |
| parent | 3c84c38dac9c938e69aab4fa973a8dc944200d98 | commitdiff |
| parent | 34b935c01f28d34f6764f0e1140ad47e7abdde1b | commitdiff |
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
* 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 |