]> 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: 8f4cb78 38e6854)
Merge branch 'Lyberta/URS2' into Lyberta/RandomStartWeapons
authorLyberta <lyberta@lyberta.net>
Tue, 29 Aug 2017 00:21:57 +0000 (03:21 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 29 Aug 2017 00:21:57 +0000 (03:21 +0300)

Trivial merge