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)
1  2 
qcsrc/server/g_world.qc
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh

Simple merge
Simple merge
Simple merge