]> gitweb.ps.run Git - ps-cgit/commit
Merge branch 'lh/plugins'
authorLars Hjemli <hjemli@gmail.com>
Sun, 9 Aug 2009 11:46:01 +0000 (13:46 +0200)
committerLars Hjemli <hjemli@gmail.com>
Sun, 9 Aug 2009 11:46:01 +0000 (13:46 +0200)
commitdb6303b58883c4417f5bcc0c1ee34fed6553dca3
treeef7775ade9eef57c5a878f9588fe545a7da2c952
parent17e3ff42646f182911fd0e5d872082977538db9e
parent97b3d252629a8a3b9d356c2532dec7611438e4b9
Merge branch 'lh/plugins'

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