]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/terencehill/bot_waypoints'
authorterencehill <piuntn@gmail.com>
Sat, 8 Dec 2018 12:25:04 +0000 (13:25 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 8 Dec 2018 12:25:04 +0000 (13:25 +0100)
1  2 
qcsrc/server/bot/api.qh
qcsrc/server/bot/default/waypoints.qc

Simple merge
Simple merge