]> 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 | combined (merge: f318148 22f7ba7)
Merge branch 'catharsis-cleanup' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 30 Jan 2017 17:43:05 +0000 (17:43 +0000)
committerMirio <opivy@hotmail.de>
Mon, 30 Jan 2017 17:43:05 +0000 (17:43 +0000)
Catharsis cleanup

See merge request !59


Trivial merge