]> 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: bc02921 fbbd6e5)
Merge branch 'master' into Lyberta/RandomItems2 560/head
authorLyberta <lyberta@lyberta.net>
Sun, 10 Jun 2018 04:36:35 +0000 (07:36 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 10 Jun 2018 04:36:35 +0000 (07:36 +0300)

Trivial merge