From: Mario <mario.mario@y7mail.com>
Date: Thu, 26 Sep 2019 04:49:24 +0000 (+0000)
Subject: Merge branch 'martin-t/AMMO' into 'master'
X-Git-Tag: xonotic-v0.8.5~1274
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8298414706b35c6726479437b0775aed4ac9b55d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/AMMO' into 'master'

Rename misleading const, fix overkill

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

8298414706b35c6726479437b0775aed4ac9b55d