]> 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: 9a75d97 bcfb2c2)
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 16:36:56 +0000 (19:36 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 16:36:56 +0000 (19:36 +0300)

Trivial merge