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 /git-gui/lib/tools.tcl | |
| parent | 71a8af60aeed0ae67d119eb5e0f7d3ce1b15b2b7 (diff) | |
| parent | 34b935c01f28d34f6764f0e1140ad47e7abdde1b (diff) | |
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 'git-gui/lib/tools.tcl')
0 files changed, 0 insertions, 0 deletions