From: Mario <mario@smbclan.net>
Date: Sun, 4 Mar 2018 03:49:02 +0000 (+1000)
Subject: Merge branch 'Mario/arc'
X-Git-Tag: xonotic-v0.8.5~2256
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=8f98be7cceabb16ad9c6720ef9df8e956f502ccf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/arc'
---

8f98be7cceabb16ad9c6720ef9df8e956f502ccf