]> 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: 598f437 6af4f25)
Merge branch 't0uYK8Ne/fuse' into 'master'
authorMirio <opivy@hotmail.de>
Sat, 4 Mar 2017 15:48:13 +0000 (15:48 +0000)
committerMirio <opivy@hotmail.de>
Sat, 4 Mar 2017 15:48:13 +0000 (15:48 +0000)
t0uYK8Ne/fuse

See merge request !65


Trivial merge