From: terencehill <piuntn@gmail.com>
Date: Sat, 27 Oct 2018 10:51:37 +0000 (+0200)
Subject: Merge branch 'terencehill/bot_waypoints'
X-Git-Tag: xonotic-v0.8.5~1742
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8639f042c5ef61287b2f7e0dbf17f8c08a2c0ebf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/bot_waypoints'
---

8639f042c5ef61287b2f7e0dbf17f8c08a2c0ebf