]> 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: daff1b0 603e5fd)
Merge branch 'Lyberta/GenmodFix' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 28 Sep 2017 06:52:20 +0000 (09:52 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 28 Sep 2017 06:52:20 +0000 (09:52 +0300)

Trivial merge