Merge branch 'master' into terencehill/race_fix
authorterencehill <piuntn@gmail.com>
Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)
1  2 
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/mutators/mutator/gamemode_race.qc

Simple merge