]> 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: 1fa3d0f 529205a)
Merge branch 'master' into Lyberta/URS3
authorLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 14:19:30 +0000 (17:19 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 14:19:30 +0000 (17:19 +0300)

Trivial merge