Merge branch 'maint-1.7.6' into maint-1.7.7
[gitweb.git] / merge-file.h
2011-04-27 Merge branch 'cn/format-patch-quiet'
2011-04-27 Merge branch 'ef/maint-strbuf-init'
2011-04-27 Merge branch 'rr/doc-content-type'
2011-04-27 Merge branch 'jc/merge-dash-previous'
2011-04-27 Merge branch 'dm/stash-k-i-p'
2011-04-27 Merge branch 'rj/sparse'
2011-04-11 sparse: Fix an "symbol 'merge_file' not decared" warning