]> 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: 0908b1c bc4fb31)
Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Tue, 7 Mar 2017 12:39:51 +0000 (13:39 +0100)
committerMirio <opivy@hotmail.de>
Tue, 7 Mar 2017 12:39:51 +0000 (13:39 +0100)

Trivial merge