]> gitweb.ps.run Git - ps-cgit/commit
Merge branch 'fh/filter-api'
authorLars Hjemli <hjemli@gmail.com>
Mon, 23 May 2011 21:28:38 +0000 (23:28 +0200)
committerLars Hjemli <hjemli@gmail.com>
Mon, 23 May 2011 21:28:38 +0000 (23:28 +0200)
commitab350a77b1d3b0e251cc28329f2e16f0566e521e
tree1af2b0760858fcd87ce1e628465f9b60af7815e3
parent652a5a18db3b0409fedfaf8c5720446d87628ba0
parentc2b58ed8539fcfa4f05cc9da316bbc782f4b8f10
Merge branch 'fh/filter-api'

Conflicts:
cgit.c
cgit.c
cgit.h
cgitrc.5.txt
shared.c
ui-repolist.c
ui-tree.c