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)
commit8d32c10f81438b5a095ddf1bbdaaed13408e841f
tree02266c94867e95f0197435138e5af7518b134ddf
parent14c3f32fe974bf37a15f738cb693c39399dc114c
parentb033eeb472dde42a24c46120ea2db8591ef5213c
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/server/sv_main.qc