]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 16 Jun 2013 02:22:37 +0000 (12:22 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 16 Jun 2013 02:22:37 +0000 (12:22 +1000)
commitbacce979f427e4d69fa7341ceb6ecf390cdecabb
tree6d733b3e4526e5b1682105b5edad14e9713f0a6f
parent3ec9f804f5c2988b7fbef33df7232fdefde08c5f
parent93c5ad5c77f223cb3005c2bd4c49f35efdfb145f
Merge branch 'master' into Mario/monsters
qcsrc/server/cl_client.qc