Merge branch 'ro/ssdiff'

author Lars Hjemli <hjemli@gmail.com>

Tue, 8 Dec 2009 18:32:48 +0000 (19:32 +0100)

committer Lars Hjemli <hjemli@gmail.com>

Tue, 8 Dec 2009 18:32:48 +0000 (19:32 +0100)
author Lars Hjemli <hjemli@gmail.com>
Tue, 8 Dec 2009 18:32:48 +0000 (19:32 +0100)
committer Lars Hjemli <hjemli@gmail.com>
Tue, 8 Dec 2009 18:32:48 +0000 (19:32 +0100)
diff --cc Makefile
Simple merge
diff --cc cgit.c
Simple merge
diff --cc cgit.css
Simple merge
diff --cc cgit.h
Simple merge
diff --cc cgitrc.5.txt
Simple merge
diff --cc ui-shared.c
Simple merge
diff --cc ui-shared.h
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Tue, 8 Dec 2009 18:32:48 +0000 (19:32 +0100)
committer	Lars Hjemli <hjemli@gmail.com>
	Tue, 8 Dec 2009 18:32:48 +0000 (19:32 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
cgit.c	patch \|	diff1 \|	diff2 \|	blob \| history
cgit.css	patch \|	diff1 \|	diff2 \|	blob \| history
cgit.h	patch \|	diff1 \|	diff2 \|	blob \| history
cgitrc.5.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ui-shared.c	patch \|	diff1 \|	diff2 \|	blob \| history
ui-shared.h	patch \|	diff1 \|	diff2 \|	blob \| history