]> 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: 2d8cd99 14d35ac)
Merge branch 'master' into maddin/map-warfare-updates
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:29:23 +0000 (00:29 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:29:23 +0000 (00:29 +0200)
1  2 
maps/warfare.map patch | diff1 | diff2 | blob | history

diff --cc maps/warfare.map
Simple merge