Merge branch 'master' into Mario/respawn_delays
authorMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 13:07:49 +0000 (06:07 -0700)
committerMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 13:07:49 +0000 (06:07 -0700)
commit117b5f5c44a743f9189e378bc0fcc33c23068c27
treefb2faaec1f62d6c3df310c1a34c05d522232d688
parent2b777d3a3bf28bbf5c29202d84a80de257e4ae7e
parentc9817f1dec9a45efdc4b617c42cc5ca907162b47
Merge branch 'master' into Mario/respawn_delays
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh