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
scripts/entities.def
scripts/entities.ent

Simple merge
Simple merge
Simple merge