]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/ca_arena_mutators
authorterencehill <piuntn@gmail.com>
Fri, 8 Feb 2013 13:48:56 +0000 (14:48 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 8 Feb 2013 13:48:56 +0000 (14:48 +0100)
commit6ec0f2147065145e9310fc5af6e16243ef805a0f
tree3bee6856123bc61104515a6f09acf38936b2c424
parent2f4fc11e35ef11e180666526c57750b292cc887a
parentc3c9a13d8b020fe15dffa06e89f385b7585be986
Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/ca_arena_mutators
qcsrc/client/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc