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

author Samual <samual@xonotic.org>

Fri, 13 May 2011 00:00:45 +0000 (20:00 -0400)

committer Samual <samual@xonotic.org>

Fri, 13 May 2011 00:00:45 +0000 (20:00 -0400)
author Samual <samual@xonotic.org>
Fri, 13 May 2011 00:00:45 +0000 (20:00 -0400)
committer Samual <samual@xonotic.org>
Fri, 13 May 2011 00:00:45 +0000 (20:00 -0400)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
author	Samual <samual@xonotic.org>
	Fri, 13 May 2011 00:00:45 +0000 (20:00 -0400)
committer	Samual <samual@xonotic.org>
	Fri, 13 May 2011 00:00:45 +0000 (20:00 -0400)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history