From: Mario <mario.mario@y7mail.com>
Date: Sat, 18 Jul 2020 12:23:39 +0000 (+0000)
Subject: Merge branch 'Mario/csqc_muzzleflash' into 'master'
X-Git-Tag: xonotic-v0.8.5~851
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9ecd2b73f8332531578e76c10df263c7a29717a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/csqc_muzzleflash' into 'master'

Merge branch Mario/csqc_muzzleflash (M merge request)

See merge request xonotic/xonotic-data.pk3dir!838
---

e9ecd2b73f8332531578e76c10df263c7a29717a