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

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

54f1f551aa7db52cb8f4d1c25df2e3a1ac86a429