]> 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: 1d81560 64c85ae)
Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:12:50 +0000 (18:12 +0100)
committerMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:12:50 +0000 (18:12 +0100)

Trivial merge