]> 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: afa6950 068c3b3)
Merge branch 'matthiaskrgr/afterslime' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 27 Mar 2017 15:36:09 +0000 (15:36 +0000)
committerMirio <opivy@hotmail.de>
Mon, 27 Mar 2017 15:36:09 +0000 (15:36 +0000)
Matthiaskrgr/afterslime

See merge request !98


Trivial merge