Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 13 Jan 2012 19:54:42 +0000 (20:54 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 13 Jan 2012 19:54:42 +0000 (20:54 +0100)
commitd0059d903039167120a2b49e29e77a20079afebf
tree4cb4d5b7dbdb75e05ad29ace71f39a61e5458e44
parent92c2b103470463c319b693d971c3cb1b7b08a1f6
parent71b725226cf16ae5b99936b8330e0d40c987a3cb
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir