]> 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: 02774a5 57fb12f)
Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 05:36:04 +0000 (08:36 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 05:36:04 +0000 (08:36 +0300)

Trivial merge