]> 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: 30c5f17 1fdab63)
Merge branch 't0uYK8Ne/afterslime' into 'master'
authorMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 23:04:39 +0000 (23:04 +0000)
committerMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 23:04:39 +0000 (23:04 +0000)
t0uYK8Ne/afterslime

Closes #120

See merge request !64


Trivial merge