]> de.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: e3c9859 1b3630b)
Merge branch 'TimePath/issues/1415' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:09:55 +0000 (11:09 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:09:55 +0000 (11:09 +0000)
Issue 1415

When plasma is ready, increment `AMMO_COUNT` by 1

See merge request !51


Trivial merge