diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:24 -0700 |
| commit | 3f20927717a8541fe607e4227f16ff6e1a5a6e22 (patch) | |
| tree | 3c1b6257e2eb388357316f027fd4e5a353e765f6 /commit.c | |
| parent | Merge branch 'es/utf8-stupid-compiler-workaround' into maint (diff) | |
| parent | ewah: use less generic macro name (diff) | |
| download | git-3f20927717a8541fe607e4227f16ff6e1a5a6e22.tar.gz git-3f20927717a8541fe607e4227f16ff6e1a5a6e22.zip | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions