]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
authorterencehill <piuntn@gmail.com>
Tue, 5 Feb 2013 21:41:41 +0000 (22:41 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 5 Feb 2013 21:41:41 +0000 (22:41 +0100)
commitad77b9efa833b1ef942252c7f86565c2c4cec52d
tree9213dd6bd9846424d53d5c699e421f8e85cc2668
parent0f6085c8ea46125d87ca81ec7f5e82f73c08f958
parente11a031d17d1e95071d9b2e8fe3f4466d4a3a908
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/progs.src
qcsrc/server/w_minstanex.qc