]> 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: dac03d7 a2fa3d6)
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Fri, 8 Jun 2018 09:42:05 +0000 (12:42 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 8 Jun 2018 09:42:05 +0000 (12:42 +0300)

Trivial merge