]> 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: f305066 8599d61)
Merge branch 'master' into maddin/map-warfare
authorMirio <opivy@hotmail.de>
Wed, 15 Apr 2015 23:35:38 +0000 (01:35 +0200)
committerMirio <opivy@hotmail.de>
Wed, 15 Apr 2015 23:35:38 +0000 (01:35 +0200)

Trivial merge