![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 12 Sep 2010 20:53:03 +0000 (13:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 12 Sep 2010 20:53:03 +0000 (13:53 -0700) | ||
| commit | 5879b6bbcaba7696e4abfa717748da166f915405 | |
| tree | 83c87b6b5c7ac72db60a027b3248e740f2f07f91 | tree | snapshot |
| parent | 5418d96ddca8134b5abeb99430f61c062d91f722 | commit | diff |
| parent | e22148f406a7a31a25ebda01d21d9a4646ce82ea | commit | diff |
Merge branch 'maint'
* maint:
t3101: modernise style
compat/nedmalloc: don't force NDEBUG on the rest of git
Conflicts:
Makefile
* maint:
t3101: modernise style
compat/nedmalloc: don't force NDEBUG on the rest of git
Conflicts:
Makefile
| Makefile | diff1 | | diff2 | | blob | history |