From: Martin Taibr <taibr.martin@gmail.com>
Date: Tue, 29 Aug 2017 15:59:49 +0000 (+0200)
Subject: Merge branch 'terencehill/bot_waypoints' into martin-t/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f817ef565e2a6e4ba98184e16ff34d6dabc615a7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/bot_waypoints' into martin-t/master
---

f817ef565e2a6e4ba98184e16ff34d6dabc615a7