]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Wed, 16 Aug 2017 00:17:03 +0000 (03:17 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 16 Aug 2017 00:17:03 +0000 (03:17 +0300)
commit648ba1e6bd4b0a0b1e17a7eca6d8ecf8d0b603fa
tree151b0d9f44bd11fa37baab522d8497301373ae58
parent764328cda62b677689f1ded0cfcda7189359b49a
parent2183056a5b6e75d2e025aa6c718eeb6f87de31b6
Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/PlayerTemplates