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)
commit678127044857fb9b89f06faf7a3313bdeb43205c
tree7d9a390db2bb6c830372d936a262b3cf03dcb5d8
parent64e7b6ddf13d965e8a91746540dc06de3e4c16fe
parent7c19cc7613de325a0e43236ee4e202fd6c9f7a7a
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/server/command/sv_cmd.qc
qcsrc/server/sv_main.qc