]> 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: fc552df c78d10c)
Merge branch 'Lyberta/URS2' into Lyberta/RandomStartWeapons
authorLyberta <lyberta@lyberta.net>
Mon, 28 Aug 2017 20:32:49 +0000 (23:32 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 28 Aug 2017 20:32:49 +0000 (23:32 +0300)

Trivial merge