]> gitweb.ps.run Git - ps-cgit/commit
Merge branch 'lh/section-from-path'
authorLars Hjemli <hjemli@gmail.com>
Sun, 19 Sep 2010 16:46:17 +0000 (18:46 +0200)
committerLars Hjemli <hjemli@gmail.com>
Sun, 19 Sep 2010 16:46:17 +0000 (18:46 +0200)
commit536c7a1eb201b44b9266babe087cb6f2b75e4a7f
tree899ecd47f770b1909d107b0f1c777e8b032b25fc
parente76a1ea427792aaa331cdec70d7d4ff1fb3422e0
parent797110e39d5d433638c82cf27d584ed9b8b93bb7
Merge branch 'lh/section-from-path'

Conflicts:
scan-tree.c
cgit.c
cgit.h
cgitrc.5.txt
scan-tree.c