Merge branch 'terencehill/bot_waypoints' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Tue, 17 Oct 2017 23:24:18 +0000 (01:24 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 17 Oct 2017 23:24:18 +0000 (01:24 +0200)
1  2 
defaultServer.cfg
qcsrc/server/bot/default/navigation.qh

Simple merge