]> 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: 4978686 ef7491f)
Merge remote-tracking branch 'origin/divVerent/afterslime-zfight-fix-by-cortez' divVerent/afterslime-zfight-fix-by-cortez
authorRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 13:44:59 +0000 (14:44 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 13:44:59 +0000 (14:44 +0100)
1  2 
maps/afterslime.map patch | diff1 | diff2 | blob | history

diff --cc maps/afterslime.map
Simple merge