]> 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: b6dbe5b 81cb3d0)
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 19:57:31 +0000 (22:57 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 19:57:31 +0000 (22:57 +0300)
1  2 
maps/finalrage.mapinfo patch | diff1 | diff2 | blob | history
maps/implosion.mapinfo patch | diff1 | diff2 | blob | history

diff --cc maps/finalrage.mapinfo
Simple merge
diff --cc maps/implosion.mapinfo
Simple merge