Merge remote-tracking branch 'origin/master' into samual/respawn_improvements
authorSamual Lenks <samual@xonotic.org>
Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)
Conflicts:
qcsrc/server/cl_client.qc

1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src

Simple merge
Simple merge
Simple merge
Simple merge