Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Tue, 17 Oct 2017 00:05:53 +0000 (02:05 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 17 Oct 2017 00:05:53 +0000 (02:05 +0200)
1  2 
qcsrc/server/sv_main.qc

Simple merge