summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-07-22 10:25:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-22 10:25:24 -0700
commitaf3e5d1b2af6322621f26791abf8d619771f04e2 (patch)
tree9530bce05e091cc9ef7b563b2593bc0b4f4606bb /notes-merge.c
parentMerge branch 'bg/xcalloc-nmemb-then-size' into maint (diff)
parentgit-instaweb: add support for Apache 2.4 (diff)
downloadtgif-af3e5d1b2af6322621f26791abf8d619771f04e2.tar.xz
Merge branch 'jm/instaweb-apache-24' into maint
* jm/instaweb-apache-24: git-instaweb: add support for Apache 2.4
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions