]> gitweb.ps.run Git - ps-cgit/commit
Merge branch 'plain-etag'
authorLars Hjemli <hjemli@gmail.com>
Sat, 25 Jul 2009 09:59:22 +0000 (11:59 +0200)
committerLars Hjemli <hjemli@gmail.com>
Sat, 25 Jul 2009 09:59:22 +0000 (11:59 +0200)
commit681fdc45473143de3f3c5f69fbc7b94f5d6b0b75
tree3bfca05875524bee0e5444fb791707bc3e593dbd
parent7e5c048505efe1902fb476cc2cb3160ff7df013d
parent3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f
Merge branch 'plain-etag'

Conflicts:
ui-shared.c
cgit.c
cgit.h
ui-plain.c
ui-shared.c