]> 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: fae8571 e3827e0)
Merge branch 'master' into Lyberta/URS2
authorLyberta <lyberta@lyberta.net>
Wed, 30 Aug 2017 03:55:07 +0000 (06:55 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 30 Aug 2017 03:55:07 +0000 (06:55 +0300)

Trivial merge