Merge remote-tracking branch 'origin/master' into terencehill/cursormode

author Samual Lenks <samual@xonotic.org>

Tue, 4 Dec 2012 20:44:39 +0000 (15:44 -0500)

committer Samual Lenks <samual@xonotic.org>

Tue, 4 Dec 2012 20:44:39 +0000 (15:44 -0500)
author Samual Lenks <samual@xonotic.org>
Tue, 4 Dec 2012 20:44:39 +0000 (15:44 -0500)
committer Samual Lenks <samual@xonotic.org>
Tue, 4 Dec 2012 20:44:39 +0000 (15:44 -0500)
diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/client/hud_config.qc
Simple merge
diff --cc qcsrc/client/mapvoting.qc
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Tue, 4 Dec 2012 20:44:39 +0000 (15:44 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Tue, 4 Dec 2012 20:44:39 +0000 (15:44 -0500)
		1	2
qcsrc/client/Main.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud_config.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/mapvoting.qc	patch \|	diff1 \|	diff2 \|	blob \| history