Merge remote-tracking branch 'origin/terencehill/misc_hud_fixes'

author Samual Lenks <samual@xonotic.org>

Sun, 10 Feb 2013 00:51:38 +0000 (19:51 -0500)

committer Samual Lenks <samual@xonotic.org>

Sun, 10 Feb 2013 00:51:38 +0000 (19:51 -0500)
author Samual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 00:51:38 +0000 (19:51 -0500)
committer Samual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 00:51:38 +0000 (19:51 -0500)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Sun, 10 Feb 2013 00:51:38 +0000 (19:51 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Sun, 10 Feb 2013 00:51:38 +0000 (19:51 -0500)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history