]> 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: ff01cd3 3cd932a)
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 06:36:26 +0000 (09:36 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 06:36:26 +0000 (09:36 +0300)

Trivial merge