Merge branch 'master' into Mario/respawn_delays
authorMario <mario.mario@y7mail.com>
Tue, 22 Oct 2013 13:46:04 +0000 (00:46 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 22 Oct 2013 13:46:04 +0000 (00:46 +1100)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
Simple merge
Simple merge