From: terencehill <piuntn@gmail.com>
Date: Tue, 7 Aug 2018 12:08:16 +0000 (+0200)
Subject: Merge branch 'master' into Mario/cursor
X-Git-Tag: xonotic-v0.8.5~1843^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e7e4e095eaeac5b8dbc60723f239547bdee88ef5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/cursor
---

e7e4e095eaeac5b8dbc60723f239547bdee88ef5