]> 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: 12a4d06 a861a69)
Merge branch 'master' into maddin/map-warfare
authorMirio <opivy@hotmail.de>
Wed, 6 May 2015 10:06:03 +0000 (12:06 +0200)
committerMirio <opivy@hotmail.de>
Wed, 6 May 2015 10:06:03 +0000 (12:06 +0200)

Trivial merge