]> 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: 727ab1b ecde008)
Merge branch 'master' into maddin/map-warfare
authorMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:38:50 +0000 (22:38 +0100)
committerMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:38:50 +0000 (22:38 +0100)

Trivial merge