]> 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: 4cf7a77 e9f0618)
Merge branch 'master' into packer/warpzones
authorMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 22:00:10 +0000 (23:00 +0100)
committerMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 22:00:10 +0000 (23:00 +0100)
1  2 
maps/erbium.map patch | diff1 | diff2 | blob | history

diff --cc maps/erbium.map
Simple merge