Merge branch 'master' into terencehill/ca_ft_fixes
authorterencehill <piuntn@gmail.com>
Mon, 16 Sep 2013 09:40:02 +0000 (11:40 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 16 Sep 2013 09:40:02 +0000 (11:40 +0200)
commita7794afc2db05650096d9c22e55cb1ca6d82aa9b
tree182dbf9232946f3c16061ae10f10ab92689bd7d4
parent53c0fad35f703c744ffe14a73bf50f96094272c6
parente2d636eb8c05657a447aaec494ae580d1c31a4ba
Merge branch 'master' into terencehill/ca_ft_fixes

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