]> 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: 4c85176 7f7f666)
Merge branch 'matthiaskrgr/dance_unstuck'
authorMirio <opivy@hotmail.de>
Fri, 28 Aug 2015 14:51:59 +0000 (16:51 +0200)
committerMirio <opivy@hotmail.de>
Fri, 28 Aug 2015 14:51:59 +0000 (16:51 +0200)

Trivial merge