]> 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: 7b8a738 dd23509)
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Sun, 11 Feb 2018 02:24:00 +0000 (05:24 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 11 Feb 2018 02:24:00 +0000 (05:24 +0300)

Trivial merge