From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 18 Sep 2019 11:44:52 +0000 (+0000)
Subject: Merge branch 'martin-t/xdf-mg' into 'master'
X-Git-Tag: xonotic-v0.8.5~1282
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=213878b86203d2ef59a06157769adb757f8daf1d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/xdf-mg' into 'master'

Fix "infinite" burst happening when reload ammo was 0 (as in XDF)

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

213878b86203d2ef59a06157769adb757f8daf1d