From: Martin Taibr Date: Sun, 29 Oct 2017 00:40:46 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into martin-t/master X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f93bde9df83efabaa317f00474da6b2ac5642fab;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into martin-t/master --- f93bde9df83efabaa317f00474da6b2ac5642fab