]> 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: 142a0bd 9eefcd8)
Merge branch 'master' into Lyberta/URS3
authorLyberta <lyberta@lyberta.net>
Sat, 16 Sep 2017 03:37:10 +0000 (06:37 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 16 Sep 2017 03:37:10 +0000 (06:37 +0300)

Trivial merge