]> 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: d378254 147c1c0)
Merge branch 'master' into matthiaskrgr/atelier
authorMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:10:53 +0000 (17:10 +0100)
committerMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:10:53 +0000 (17:10 +0100)

Trivial merge