]> 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: 14a7dd3 c25812c)
Merge branch 'Lyberta/PrintMove' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Thu, 17 May 2018 08:59:17 +0000 (11:59 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 17 May 2018 08:59:17 +0000 (11:59 +0300)

Trivial merge