From: terencehill <piuntn@gmail.com>
Date: Sat, 19 Aug 2017 15:26:44 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~79
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5a7362e456f39815970f1d71cfc8822446e3cb60;p=xonotic%2Fxonotic-data.pk3dir.git

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

5a7362e456f39815970f1d71cfc8822446e3cb60