Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 15 Jul 2017 09:44:46 +0000 (11:44 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 15 Jul 2017 09:44:46 +0000 (11:44 +0200)
1  2 
qcsrc/server/sv_main.qc

Simple merge