summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-12 13:53:03 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-12 13:53:03 -0700
commit5879b6bbcaba7696e4abfa717748da166f915405 (patch)
tree83c87b6b5c7ac72db60a027b3248e740f2f07f91 /git-gui
parent5418d96ddca8134b5abeb99430f61c062d91f722 (diff)
parente22148f406a7a31a25ebda01d21d9a4646ce82ea (diff)
downloadgit-5879b6bbcaba7696e4abfa717748da166f915405.tar.gz
Merge branch 'maint'
* maint: t3101: modernise style compat/nedmalloc: don't force NDEBUG on the rest of git Conflicts: Makefile
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions