]> 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: 5bdf787 14bb545)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 24 May 2011 18:12:12 +0000 (20:12 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 24 May 2011 18:12:12 +0000 (20:12 +0200)
1  2 
maps/red-planet.map patch | diff1 | diff2 | blob | history
scripts/entities.def patch | diff1 | diff2 | blob | history
scripts/entities.ent patch | diff1 | diff2 | blob | history

diff --cc maps/red-planet.map
Simple merge
diff --cc scripts/entities.def
Simple merge
diff --cc scripts/entities.ent
Simple merge