]> 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: 0112f17 6125fd1)
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Sun, 21 Jan 2018 03:05:47 +0000 (06:05 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 21 Jan 2018 03:05:47 +0000 (06:05 +0300)

Trivial merge