From: Mario <mario@smbclan.net>
Date: Mon, 25 Jun 2018 06:35:43 +0000 (+1000)
Subject: Merge branch 'master' into Mario/cursor
X-Git-Tag: xonotic-v0.8.5~1843^2~8
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=9c39e07ece852cd342ad2a58f9cf4895a305b524;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git

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

9c39e07ece852cd342ad2a58f9cf4895a305b524