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

author Samual Lenks <samual@xonotic.org>

Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)

committer Samual Lenks <samual@xonotic.org>

Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)
author Samual Lenks <samual@xonotic.org>
Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)
committer Samual Lenks <samual@xonotic.org>
Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
diff --cc qcsrc/server/progs.src
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)
committer	Samual Lenks <samual@xonotic.org>
	Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	patch \|	diff1 \|	diff2 \|	blob \| history