]> 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 | compact (merge: cda67c2 71d8c7e)
Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 00:35:25 +0000 (02:35 +0200)
committerMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 00:35:25 +0000 (02:35 +0200)

Trivial merge