]> 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: 764328c 2183056)
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)

Trivial merge