git.cameronkatri.com Git - cgit.git/commit

]> git.cameronkatri.com Git - cgit.git/commit

git.ckatri.com / cgit.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9c8be94 ab67164)

author	Lars Hjemli <hjemli@gmail.com>
	Sat, 6 Dec 2008 10:37:37 +0000 (11:37 +0100)
committer	Lars Hjemli <hjemli@gmail.com>
	Sat, 6 Dec 2008 10:37:37 +0000 (11:37 +0100)
commit	3c32fe07717f27fc891b66ccd06057fb810d03ad
tree	04897b3eac6432c43284e7da79161e47856d078b	tree \| snapshot
parent	9c8be943f72b6f1bda5a31ce401899c3dd734e98	commit \| diff
parent	ab67164d6217fcda5ef3e07aefa3dd6eee6b65a3	commit \| diff

Merge branch 'full-log'

Conflicts:
cgit.c
cgit.h

cgit.c	diff1 \|	diff2 \|	blob \| history
cgit.h	diff1 \|	diff2 \|	blob \| history
ui-log.c	diff1 \|	diff2 \|	blob \| history
ui-refs.c	diff1 \|	diff2 \|	blob \| history
ui-repolist.c	diff1 \|	diff2 \|	blob \| history
ui-shared.c	diff1 \|	diff2 \|	blob \| history

A hyperfast web frontend for git repositories written in C.