]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd7f61a 9712353)
Merge branch 't0uYK8Ne/fix-125'
authorMirio <opivy@hotmail.de>
Mon, 6 Mar 2017 16:22:04 +0000 (17:22 +0100)
committerMirio <opivy@hotmail.de>
Mon, 6 Mar 2017 16:22:04 +0000 (17:22 +0100)

Trivial merge