]> 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: 10cb0a9 80b29c9)
Merge branch 'master' into amade/finalrage
authorMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:38:28 +0000 (18:38 +0200)
committerMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:38:28 +0000 (18:38 +0200)

Trivial merge