Merge branch 'og/tree-view-selection'

author Lars Hjemli <hjemli@gmail.com>

Tue, 27 Jan 2009 19:21:56 +0000 (20:21 +0100)

committer Lars Hjemli <hjemli@gmail.com>

Tue, 27 Jan 2009 19:21:56 +0000 (20:21 +0100)
author Lars Hjemli <hjemli@gmail.com>
Tue, 27 Jan 2009 19:21:56 +0000 (20:21 +0100)
committer Lars Hjemli <hjemli@gmail.com>
Tue, 27 Jan 2009 19:21:56 +0000 (20:21 +0100)
diff --cc cgit.css
Simple merge
diff --cc ui-tree.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Tue, 27 Jan 2009 19:21:56 +0000 (20:21 +0100)
committer	Lars Hjemli <hjemli@gmail.com>
	Tue, 27 Jan 2009 19:21:56 +0000 (20:21 +0100)
		1	2
cgit.css	patch \|	diff1 \|	diff2 \|	blob \| history
ui-tree.c	patch \|	diff1 \|	diff2 \|	blob \| history