From: Mario <zacjardine@y7mail.com>
Date: Fri, 21 Sep 2018 02:19:30 +0000 (+0000)
Subject: Merge branch 'Mario/cursor' into 'master'
X-Git-Tag: xonotic-v0.8.5~1843
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3cce38a477f7cb7f6da52a1347c68c1bc55ea49;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/cursor' into 'master'

Merge branch Mario/cursor (M merge request)

Closes #1128

See merge request xonotic/xonotic-data.pk3dir!570
---

e3cce38a477f7cb7f6da52a1347c68c1bc55ea49