]> 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: 473559d 183f0c1)
Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Sat, 15 Oct 2016 02:31:12 +0000 (04:31 +0200)
committerMirio <opivy@hotmail.de>
Sat, 15 Oct 2016 02:31:12 +0000 (04:31 +0200)

Trivial merge