Merge branch 'master' into nyov/more-lineedit-fanciness

author nyov <nyov@nexnode.net>

Fri, 9 Mar 2012 06:55:47 +0000 (07:55 +0100)

committer nyov <nyov@nexnode.net>

Fri, 9 Mar 2012 06:55:47 +0000 (07:55 +0100)
author nyov <nyov@nexnode.net>
Fri, 9 Mar 2012 06:55:47 +0000 (07:55 +0100)
committer nyov <nyov@nexnode.net>
Fri, 9 Mar 2012 06:55:47 +0000 (07:55 +0100)
diff --cc console.c
Simple merge
diff --cc quakedef.h
Simple merge
author	nyov <nyov@nexnode.net>
	Fri, 9 Mar 2012 06:55:47 +0000 (07:55 +0100)
committer	nyov <nyov@nexnode.net>
	Fri, 9 Mar 2012 06:55:47 +0000 (07:55 +0100)
		1	2
console.c	patch \|	diff1 \|	diff2 \|	blob \| history
quakedef.h	patch \|	diff1 \|	diff2 \|	blob \| history