From: Mario <zacjardine@y7mail.com>
Date: Wed, 28 Jun 2017 22:10:15 +0000 (+0000)
Subject: Merge branch 'Lyberta/OKShotgunAmmoUsage' into 'master'
X-Git-Tag: xonotic-v0.8.5~2672
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4645e628012c04435ba01fd6b4d10618ddf44e44;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/OKShotgunAmmoUsage' into 'master'

Lowered OK shotgun ammo usage

See merge request !449
---

4645e628012c04435ba01fd6b4d10618ddf44e44