]> 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: fa9e508 3618332)
Merge branch 'Justin/erbium' into 'master'
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:37:03 +0000 (20:37 +0000)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:37:03 +0000 (20:37 +0000)
Justin/erbium

See merge request !30


Trivial merge