]> granicus.if.org Git - cgit/commit
Merge branch 'jh/context-lines'
authorLars Hjemli <hjemli@gmail.com>
Tue, 22 Jun 2010 14:16:12 +0000 (16:16 +0200)
committerLars Hjemli <hjemli@gmail.com>
Tue, 22 Jun 2010 14:16:12 +0000 (16:16 +0200)
commit6f92f332e6a9ee3e16051bda9fe148607af67f65
tree49cb7d145fbf40793b220efdc92cd80ab2c6ca05
parent37a24e4e39737edaa5cdde501346a65eeb280e63
parentd20313e3daf855ee5d4808e050f54614c200d7b1
Merge branch 'jh/context-lines'

Conflicts:
cgit.c
cgit.h
cgit.c
cgit.h
shared.c