]> 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: 0d69df8 8865b77)
Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:33:52 +0000 (21:33 +0100)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:33:52 +0000 (21:33 +0100)

Trivial merge