From: Mario <zacjardine@y7mail.com>
Date: Sun, 14 Dec 2014 11:09:55 +0000 (+0000)
Subject: Merge branch 'TimePath/issues/1415' into 'master'
X-Git-Tag: xonotic-v0.8.0~87
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c6de5cf2639fc8c982b3ed82523b062ab65bacbd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/issues/1415' into 'master'

Issue 1415

When plasma is ready, increment `AMMO_COUNT` by 1

See merge request !51
---

c6de5cf2639fc8c982b3ed82523b062ab65bacbd