Merge remote branch 'origin/master' into samual/hud_updates

author Samual <samual@xonotic.org>

Mon, 24 Oct 2011 03:34:19 +0000 (23:34 -0400)

committer Samual <samual@xonotic.org>

Mon, 24 Oct 2011 03:34:19 +0000 (23:34 -0400)
author Samual <samual@xonotic.org>
Mon, 24 Oct 2011 03:34:19 +0000 (23:34 -0400)
committer Samual <samual@xonotic.org>
Mon, 24 Oct 2011 03:34:19 +0000 (23:34 -0400)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
author	Samual <samual@xonotic.org>
	Mon, 24 Oct 2011 03:34:19 +0000 (23:34 -0400)
committer	Samual <samual@xonotic.org>
	Mon, 24 Oct 2011 03:34:19 +0000 (23:34 -0400)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history