summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-10-18 23:00:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-18 23:00:45 -0700
commitd9499c80c1bd25fbb84037fd0c8aaaf99c4d3d28 (patch)
treefae91abd28fad58e91a7fd4a1ec001b38c42ce9b /merge-recursive.h
parentdescribe: load refnames before calling describe() (diff)
parentinstaweb: support mod_cgid for apache2 (diff)
downloadtgif-d9499c80c1bd25fbb84037fd0c8aaaf99c4d3d28.tar.xz
Merge branch 'mr/instaweb-cgid'
* mr/instaweb-cgid: instaweb: support mod_cgid for apache2
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions