]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 25 Feb 2013 19:21:59 +0000 (06:21 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 25 Feb 2013 19:21:59 +0000 (06:21 +1100)
commit75a16a543097a05b57763e284d014dc67e01885a
treeb6c15f64b4cdf49f235d3aba79e76555900226e9
parentf174388fb6eabd6a5e9a39b711e9b43b5fe6013e
parent64d58e3d7b97cf1c2e27628107dd3876f82f9992
Merge branch 'master' into mario/monsters
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc