]> 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: b74fbfd 61659a0)
Merge branch 'master' into Lyberta/RandomItems
authorLyberta <lyberta@lyberta.net>
Tue, 24 Oct 2017 20:02:44 +0000 (23:02 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 24 Oct 2017 20:02:44 +0000 (23:02 +0300)

Trivial merge