]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
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)
commit269b6bdce9c1f32a3382921aa8e777bdbdbd062e
tree84734d18afb5bc160e4a0afcd5885c51c41fcb80
parent5bdf787e0fc2697dc22ec6f75ca2f862f319c5ae
parent14bb545314ad957e7108386227a74a208d35cfaa
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
maps/red-planet.map
scripts/entities.def
scripts/entities.ent