]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e66eb45 30071e1)
Merge branch 'master' into Mirio/catharsis
authorMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 15:50:14 +0000 (17:50 +0200)
committerMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 15:50:14 +0000 (17:50 +0200)

Trivial merge