]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 04:40:05 +0000 (07:40 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 04:40:05 +0000 (07:40 +0300)
commit7a5ef79c85ade6f8bfb822fe84618c9f7644e013
tree4e299e4ec9a4143f71368d9b0b36da8c7cf81ef3
parent121f83a4533d6c29ec468d7cd31a5d473d1f2aed
parentca89acb27b5bd9697f1ac287b1506ef79b2da20b
Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/Survival