]> 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: 15a474a 71636e8)
Merge branch 'master' into Lyberta/KillSound
authorLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:42:10 +0000 (19:42 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:42:10 +0000 (19:42 +0300)

Trivial merge