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

author Samual <samual@xonotic.org>

Fri, 23 Sep 2011 05:59:15 +0000 (01:59 -0400)

committer Samual <samual@xonotic.org>

Fri, 23 Sep 2011 05:59:15 +0000 (01:59 -0400)
author Samual <samual@xonotic.org>
Fri, 23 Sep 2011 05:59:15 +0000 (01:59 -0400)
committer Samual <samual@xonotic.org>
Fri, 23 Sep 2011 05:59:15 +0000 (01:59 -0400)
diff --cc balance25.cfg
Simple merge
diff --cc balanceFruit.cfg
Simple merge
diff --cc balanceLeeStricklin.cfg
Simple merge
diff --cc balanceXonotic.cfg
Simple merge
diff --cc balancetZork.cfg
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
author	Samual <samual@xonotic.org>
	Fri, 23 Sep 2011 05:59:15 +0000 (01:59 -0400)
committer	Samual <samual@xonotic.org>
	Fri, 23 Sep 2011 05:59:15 +0000 (01:59 -0400)
		1	2
balance25.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
balanceFruit.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
balanceLeeStricklin.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
balanceXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
balancetZork.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history