From: terencehill <piuntn@gmail.com>
Date: Mon, 11 Sep 2017 16:45:17 +0000 (+0200)
Subject: Merge branch 'terencehill/bot_waypoints' into terencehill/bot_ai
X-Git-Tag: xonotic-v0.8.5~2378^2~60
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=829cfa5d9f0d171e73a07937bfc65f05751c9c7c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/bot_waypoints' into terencehill/bot_ai
---

829cfa5d9f0d171e73a07937bfc65f05751c9c7c