]> 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: 0b13a14 e3f4ce4)
merge conflict
authorMirio <opivy@hotmail.de>
Sun, 26 Feb 2017 19:19:12 +0000 (20:19 +0100)
committerMirio <opivy@hotmail.de>
Sun, 26 Feb 2017 19:19:12 +0000 (20:19 +0100)
1  2 
maps/fuse.map patch | diff1 | diff2 | blob | history

diff --cc maps/fuse.map
Simple merge