]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2206fe 8079e57)
Merge branch 'martin-t/xdf-mg' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 18 Sep 2019 11:44:52 +0000 (11:44 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 18 Sep 2019 11:44:52 +0000 (11:44 +0000)
Fix "infinite" burst happening when reload ammo was 0 (as in XDF)

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


Trivial merge