]> 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: 73344c0 82354fd)
Merge branch 'master' into Mirio/silentsiege
authorMirio <opivy@hotmail.de>
Sun, 26 Feb 2017 19:26:11 +0000 (20:26 +0100)
committerMirio <opivy@hotmail.de>
Sun, 26 Feb 2017 19:26:11 +0000 (20:26 +0100)
1  2 
maps/silentsiege.map patch | diff1 | diff2 | blob | history

diff --cc maps/silentsiege.map
Simple merge