From: Mario <mario@smbclan.net>
Date: Mon, 25 Jun 2018 05:25:08 +0000 (+1000)
Subject: Merge branch 'master' into Mario/weapons_fpsfix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9a214a1be6efc6b4c9eeac8c2e0c50dc5dda357c;p=xonotic%2Fxonotic-data.pk3dir.git

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

9a214a1be6efc6b4c9eeac8c2e0c50dc5dda357c