From: terencehill <piuntn@gmail.com>
Date: Wed, 31 Jul 2019 21:02:43 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~1356^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=772fb683d951a622cc8520827096ec34fdea4763;p=xonotic%2Fxonotic-data.pk3dir.git

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

772fb683d951a622cc8520827096ec34fdea4763