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)
commit77d6a05629e33da863fccb3cdd03b3c63af890dd
treea742dd7071ca9c5ed542b95c55e20bce1eae3476
parentb31c13cbd4fb79981e881e0599caf01d9d8dfd62
parent1a80f55aa1e01e7c590d615eac9d6f87787c1656
Merge branch 'master' into terencehill/race_fix
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/mutators/mutator/gamemode_race.qc