]> de.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: 774575d c0ad70d)
Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Sun, 25 Dec 2016 13:44:29 +0000 (14:44 +0100)
committerMirio <opivy@hotmail.de>
Sun, 25 Dec 2016 13:44:29 +0000 (14:44 +0100)

Trivial merge