]> 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: aaf566b b69581a)
Merge branch 'master' into kuniuthefrogg/apace
authorMirio <opivy@hotmail.de>
Fri, 17 Mar 2017 18:21:07 +0000 (19:21 +0100)
committerMirio <opivy@hotmail.de>
Fri, 17 Mar 2017 18:21:07 +0000 (19:21 +0100)

Trivial merge