Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

author Samual Lenks <samual@xonotic.org>

Mon, 25 Feb 2013 18:44:42 +0000 (13:44 -0500)

committer Samual Lenks <samual@xonotic.org>

Mon, 25 Feb 2013 18:44:42 +0000 (13:44 -0500)
author Samual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 18:44:42 +0000 (13:44 -0500)
committer Samual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 18:44:42 +0000 (13:44 -0500)
diff --cc _hud_common.cfg
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/w_minelayer.qc
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Mon, 25 Feb 2013 18:44:42 +0000 (13:44 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Mon, 25 Feb 2013 18:44:42 +0000 (13:44 -0500)
		1	2
_hud_common.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minelayer.qc	patch \|	diff1 \|	diff2 \|	blob \| history