Merge branch 'master' into terencehill/ca_ft_fixes
authorterencehill <piuntn@gmail.com>
Sun, 5 Jan 2014 18:00:43 +0000 (19:00 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 5 Jan 2014 18:00:43 +0000 (19:00 +0100)
commitace43a0b9fc339c80df65741952b07dd2bc5f52f
tree77c98336bec427e200a6f38b0104f2a42dc712c9
parent775fd0aea75ebb8bd7e4436a1189ea8b3c64c427
parente23579dcf3caf46f7d186bfc4b641458b36b5365
Merge branch 'master' into terencehill/ca_ft_fixes

Conflicts:
gamemodes.cfg
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_arena.qc
qcsrc/server/mutators/gamemode_ca.qc
gamemodes.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_impulse.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_lms.qc
qcsrc/server/scores_rules.qc
qcsrc/server/teamplay.qc