]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85920ae d45e593)
Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 21:44:08 +0000 (00:44 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 21:44:08 +0000 (00:44 +0300)

Trivial merge