]> 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: 0dab775 2397776)
Merge branch 'master' into amade/finalrage
authorMirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:19:54 +0000 (15:19 +0100)
committerMirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:19:54 +0000 (15:19 +0100)

Trivial merge