Merge branch 'master' into mirceakitsune/sandbox

author Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

Fri, 28 Oct 2011 12:22:43 +0000 (15:22 +0300)

committer Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

Fri, 28 Oct 2011 12:22:43 +0000 (15:22 +0300)
author Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 28 Oct 2011 12:22:43 +0000 (15:22 +0300)
committer Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 28 Oct 2011 12:22:43 +0000 (15:22 +0300)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
diff --cc qcsrc/server/progs.src
Simple merge
diff --cc qcsrc/server/sv_main.qc
Simple merge
author	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Fri, 28 Oct 2011 12:22:43 +0000 (15:22 +0300)
committer	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Fri, 28 Oct 2011 12:22:43 +0000 (15:22 +0300)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	patch \|	diff1 \|	diff2 \|	blob \| history