Merge remote-tracking branch 'origin/master' into samual/combined_updates

author Samual Lenks <samual@xonotic.org>

Sun, 24 Nov 2013 05:06:24 +0000 (00:06 -0500)

committer Samual Lenks <samual@xonotic.org>

Sun, 24 Nov 2013 05:06:24 +0000 (00:06 -0500)
author Samual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 05:06:24 +0000 (00:06 -0500)
committer Samual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 05:06:24 +0000 (00:06 -0500)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/progs.src
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Sun, 24 Nov 2013 05:06:24 +0000 (00:06 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Sun, 24 Nov 2013 05:06:24 +0000 (00:06 -0500)
		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
qcsrc/server/progs.src	patch \|	diff1 \|	diff2 \|	blob \| history