]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/start_ammo' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 23:49:30 +0000 (23:49 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 23:49:30 +0000 (23:49 +0000)
Terencehill/start ammo

Fixes for a few issues

See merge request !53


Trivial merge