Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 13 Aug 2011 06:22:32 +0000 (08:22 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 13 Aug 2011 06:22:32 +0000 (08:22 +0200)
commit16527236b31e1d62685be86f06a02763caaab31a
tree85b961cf13e6385e109588a06a73fffd7ae3cf8f
parent86cdab1b2213b3c1379cdaf57b5522808618bdea
parentadc73f228b24166e5657644bfa632ba19f470b9a
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir