Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 26 Jan 2011 07:55:36 +0000 (08:55 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 26 Jan 2011 07:55:36 +0000 (08:55 +0100)
commite68a3522efc9f5a5bccabf96ec2e641e0b0fee1b
tree0e65ef7d17de138444eb27ad476bb72e637771fd
parent0f337c6f15e811b77a0009704aa0c1dfb024357b
parentc64c32952029e5eb65ef41a7a9ef3d8bd6b82492
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir