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

author Samual <samual@xonotic.org>

Tue, 22 Feb 2011 06:03:51 +0000 (01:03 -0500)

committer Samual <samual@xonotic.org>

Tue, 22 Feb 2011 06:03:51 +0000 (01:03 -0500)
author Samual <samual@xonotic.org>
Tue, 22 Feb 2011 06:03:51 +0000 (01:03 -0500)
committer Samual <samual@xonotic.org>
Tue, 22 Feb 2011 06:03:51 +0000 (01:03 -0500)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge
author	Samual <samual@xonotic.org>
	Tue, 22 Feb 2011 06:03:51 +0000 (01:03 -0500)
committer	Samual <samual@xonotic.org>
	Tue, 22 Feb 2011 06:03:51 +0000 (01:03 -0500)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	patch \|	diff1 \|	diff2 \|	blob \| history