From: terencehill <piuntn@gmail.com>
Date: Mon, 22 Oct 2018 15:38:04 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~1742^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a692581c23cc689f1f695dd04b6b2a2b27a567f0;p=xonotic%2Fxonotic-data.pk3dir.git

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

a692581c23cc689f1f695dd04b6b2a2b27a567f0