From: Mario <zacjardine@y7mail.com>
Date: Mon, 22 Jan 2018 11:46:06 +0000 (+0000)
Subject: Merge branch 'terencehill/bot_waypoints' into 'master'
X-Git-Tag: xonotic-v0.8.5~139
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a21b360bec3b0be9c42c58b2c61f4d45e8bce84;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'terencehill/bot_waypoints' into 'master'

bot waypoints

See merge request xonotic/xonotic-maps.pk3dir!108
---

3a21b360bec3b0be9c42c58b2c61f4d45e8bce84