]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea14e56 34e6959)
Merge branch 'master' into Lyberta/PrintMove
authorLyberta <lyberta@lyberta.net>
Wed, 2 May 2018 09:03:22 +0000 (12:03 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 2 May 2018 09:03:22 +0000 (12:03 +0300)

Trivial merge