Merge branch 'master' into terencehill/race_fix
authorterencehill <piuntn@gmail.com>
Sun, 27 Mar 2016 16:20:20 +0000 (18:20 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 27 Mar 2016 16:20:20 +0000 (18:20 +0200)
commit3bdee6303ce762a39c2ad67a70745668ba298043
tree7fd0cadbcb186248617633d7b1c319fe6f71a0df
parent2da5b152dafe382fa1cd5c93f6ae05075a436010
parentb34c9928b7ffaa29800572dc7d5c78e3b6427cc5
Merge branch 'master' into terencehill/race_fix
qcsrc/server/g_world.qc
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh