From: Mario <mario@smbclan.net>
Date: Wed, 22 Aug 2018 08:11:26 +0000 (+1000)
Subject: Merge branch 'morphed/energyweapons'
X-Git-Tag: xonotic-v0.8.5~1922
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ec36fca91cc54597f21fd3d673ed58992fb31f6f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'morphed/energyweapons'
---

ec36fca91cc54597f21fd3d673ed58992fb31f6f