]> 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: c366dda 6a4d5ec)
Merge branch 'Lyberta/RandomItems' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Mon, 16 Oct 2017 02:40:06 +0000 (05:40 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 16 Oct 2017 02:40:06 +0000 (05:40 +0300)

Trivial merge