Merge branch 'ml/head-include'

author Lars Hjemli <hjemli@gmail.com>

Sat, 25 Jul 2009 10:04:08 +0000 (12:04 +0200)

committer Lars Hjemli <hjemli@gmail.com>

Sat, 25 Jul 2009 10:04:08 +0000 (12:04 +0200)
author Lars Hjemli <hjemli@gmail.com>
Sat, 25 Jul 2009 10:04:08 +0000 (12:04 +0200)
committer Lars Hjemli <hjemli@gmail.com>
Sat, 25 Jul 2009 10:04:08 +0000 (12:04 +0200)
diff --cc cgit.c
Simple merge
diff --cc cgit.h
Simple merge
diff --cc ui-shared.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Sat, 25 Jul 2009 10:04:08 +0000 (12:04 +0200)
committer	Lars Hjemli <hjemli@gmail.com>
	Sat, 25 Jul 2009 10:04:08 +0000 (12:04 +0200)
		1	2
cgit.c	patch \|	diff1 \|	diff2 \|	blob \| history
cgit.h	patch \|	diff1 \|	diff2 \|	blob \| history
ui-shared.c	patch \|	diff1 \|	diff2 \|	blob \| history