]> 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: 3b25907 dd053de)
Merge branch 'Mirio/dance' into 'master'
authorMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 23:06:02 +0000 (23:06 +0000)
committerMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 23:06:02 +0000 (23:06 +0000)
Break the glass, #121

See merge request !56


Trivial merge