]> 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: 4e85906 80b29c9)
Merge branch 'master' into maddin/map-warfare
authorMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:42:03 +0000 (18:42 +0200)
committerMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:42:03 +0000 (18:42 +0200)

Trivial merge