]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c94049b 3f0db00)
Merge branch 'master' into kuniuthefrogg/apace kuniuthefrogg/apace 29/head
authorMirio <opivy@hotmail.de>
Tue, 11 Apr 2017 11:10:13 +0000 (13:10 +0200)
committerMirio <opivy@hotmail.de>
Tue, 11 Apr 2017 11:10:13 +0000 (13:10 +0200)

Trivial merge