]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
authorterencehill <piuntn@gmail.com>
Mon, 3 Dec 2012 21:05:28 +0000 (22:05 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 3 Dec 2012 21:05:28 +0000 (22:05 +0100)
commit3acc9643a56187fff82c19ab2c5921c03552832d
tree325c6770e9ebd33c37fdaa6eaa29ef6372c0202b
parentd89dc046f4dd683589ae181ec5188da3069c6815
parent77c8f18d6cf54ac0c0b1e426ac79842e7f593c80
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc