Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Wed, 6 Sep 2017 16:36:50 +0000 (18:36 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 6 Sep 2017 16:36:50 +0000 (18:36 +0200)
1  2 
qcsrc/server/command/sv_cmd.qc
qcsrc/server/sv_main.qc

Simple merge
Simple merge