]> 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: ce90926 73a0aa0)
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Sun, 10 Sep 2017 23:40:30 +0000 (02:40 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 10 Sep 2017 23:40:30 +0000 (02:40 +0300)

Trivial merge