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

author Samual <samual@xonotic.org>

Wed, 6 Apr 2011 01:34:23 +0000 (21:34 -0400)

committer Samual <samual@xonotic.org>

Wed, 6 Apr 2011 01:34:23 +0000 (21:34 -0400)
author Samual <samual@xonotic.org>
Wed, 6 Apr 2011 01:34:23 +0000 (21:34 -0400)
committer Samual <samual@xonotic.org>
Wed, 6 Apr 2011 01:34:23 +0000 (21:34 -0400)
diff --cc qcsrc/server/cl_client.qc
Simple merge
diff --cc qcsrc/server/cl_player.qc
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
author	Samual <samual@xonotic.org>
	Wed, 6 Apr 2011 01:34:23 +0000 (21:34 -0400)
committer	Samual <samual@xonotic.org>
	Wed, 6 Apr 2011 01:34:23 +0000 (21:34 -0400)
		1	2
qcsrc/server/cl_client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history