]> 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: 30071e1 bea996f)
Merge branch 'Mirio/catharsis' into 'master'
authorMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 18:06:20 +0000 (18:06 +0000)
committerMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 18:06:20 +0000 (18:06 +0000)
Mirio/catharsis

Fixes #101

See merge request !35


Trivial merge