]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
authorterencehill <piuntn@gmail.com>
Fri, 8 Feb 2013 13:48:10 +0000 (14:48 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 8 Feb 2013 13:48:10 +0000 (14:48 +0100)
commitc3c9a13d8b020fe15dffa06e89f385b7585be986
treee0a1d5da9eaf66da6cda3006d8e6c7df55ee2410
parentdcf37c087f0202789ea0c8d588f7ed380b39c00f
parent2b39ce52fed96bf1d0eec2209c34632308590e1c
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src
qcsrc/server/teamplay.qc