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

author Samual <samual@xonotic.org>

Sun, 4 Dec 2011 20:05:47 +0000 (15:05 -0500)

committer Samual <samual@xonotic.org>

Sun, 4 Dec 2011 20:05:47 +0000 (15:05 -0500)
author Samual <samual@xonotic.org>
Sun, 4 Dec 2011 20:05:47 +0000 (15:05 -0500)
committer Samual <samual@xonotic.org>
Sun, 4 Dec 2011 20:05:47 +0000 (15:05 -0500)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
diff --cc qcsrc/server/progs.src
Simple merge
author	Samual <samual@xonotic.org>
	Sun, 4 Dec 2011 20:05:47 +0000 (15:05 -0500)
committer	Samual <samual@xonotic.org>
	Sun, 4 Dec 2011 20:05:47 +0000 (15:05 -0500)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	patch \|	diff1 \|	diff2 \|	blob \| history