]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/respawn_delays
authorMario <mario.mario@y7mail.com>
Fri, 26 Jul 2013 14:15:27 +0000 (00:15 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 26 Jul 2013 14:15:27 +0000 (00:15 +1000)
commit2b777d3a3bf28bbf5c29202d84a80de257e4ae7e
treeb12c90a4a08f0bb7e55e8dad96f87b12a499f940
parent5e43baf2e8a516a8f2f12aa19b603a8e4f8d6243
parent62a098d8ce9cfc7e2c78da427f6e2dae51f0239f
Merge branch 'master' into Mario/respawn_delays
defaultXonotic.cfg
qcsrc/server/cl_client.qc