summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2008-10-09 10:52:04 -0700
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2008-10-09 10:52:04 -0700
commit01ed1079f3fae37eda7e0e0dcab9b74b34e9327e (patch)
tree36953fe7b6ba44fda4d8a095869b2453e0ccdb5e /builtin-merge-file.c
parentMerge branch 'dm/svn-branch' (diff)
parentMerge branch 'pb/gitweb-tagcloud' into pb/gitweb (diff)
downloadtgif-01ed1079f3fae37eda7e0e0dcab9b74b34e9327e.tar.xz
Merge branch 'pb/gitweb'
* pb/gitweb: gitweb: Support for simple project search form gitweb: Make the by_tag filter delve in forks as well gitweb: Support for tag clouds gitweb: Add support for extending the action bar with custom links gitweb: Sort the list of forks on the summary page by age gitweb: Clean-up sorting of project list
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions