]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit1532af143411264782fd7646d151df486e2b16aa
tree024217f1a98ace6b1677e4da66f13bfb74c81d9e
parent117b5f5c44a743f9189e378bc0fcc33c23068c27
parent39c6fe854bc866de4089c9a48a7db488296285db
Merge branch 'master' into Mario/respawn_delays
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh