]> 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: 7776f5d 1d2572e)
Merge branch 'Lyberta/DynamicHandicap2' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sat, 23 Sep 2017 02:23:09 +0000 (05:23 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 23 Sep 2017 02:23:09 +0000 (05:23 +0300)

Trivial merge