Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Fri, 3 Jun 2011 20:14:55 +0000 (22:14 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 3 Jun 2011 20:14:55 +0000 (22:14 +0200)
commit276a9d9ea68da422eec7c07bf913e93de2c7ad50
tree5010f9f82e49e6cdc3b68a6c529a7ec2948706d2
parentc6b25f46652c65e88d9cdfc62f569f509906e99f
parent735b22058ab8b255b49103152b80b6b531d18318
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir