]> 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: e3f4ce4 8f7c8e8)
Merge branch 'Mirio/fuse'
authorMirio <opivy@hotmail.de>
Sun, 26 Feb 2017 19:24:57 +0000 (20:24 +0100)
committerMirio <opivy@hotmail.de>
Sun, 26 Feb 2017 19:24:57 +0000 (20:24 +0100)

Trivial merge