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

author unknown <samual@xonotic.org>

Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)

committer unknown <samual@xonotic.org>

Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)
author unknown <samual@xonotic.org>
Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)
committer unknown <samual@xonotic.org>
Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/common/constants.qh
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge
author	unknown <samual@xonotic.org>
	Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)
committer	unknown <samual@xonotic.org>
	Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.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