Merge branch 'lh/panel'

author Lars Hjemli <hjemli@gmail.com>

Mon, 23 May 2011 21:29:24 +0000 (23:29 +0200)

committer Lars Hjemli <hjemli@gmail.com>

Mon, 23 May 2011 21:29:24 +0000 (23:29 +0200)
author Lars Hjemli <hjemli@gmail.com>
Mon, 23 May 2011 21:29:24 +0000 (23:29 +0200)
committer Lars Hjemli <hjemli@gmail.com>
Mon, 23 May 2011 21:29:24 +0000 (23:29 +0200)
diff --cc cmd.c
Simple merge
diff --cc html.c
Simple merge
diff --cc ui-commit.c
Simple merge
diff --cc ui-diff.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Mon, 23 May 2011 21:29:24 +0000 (23:29 +0200)
committer	Lars Hjemli <hjemli@gmail.com>
	Mon, 23 May 2011 21:29:24 +0000 (23:29 +0200)
		1	2
cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history
html.c	patch \|	diff1 \|	diff2 \|	blob \| history
ui-commit.c	patch \|	diff1 \|	diff2 \|	blob \| history
ui-diff.c	patch \|	diff1 \|	diff2 \|	blob \| history