Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 19 Jan 2011 16:21:25 +0000 (17:21 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 19 Jan 2011 16:21:25 +0000 (17:21 +0100)
commit0209288d556022db3c72b07e25da1d20e00f9337
tree4c32dfa534c1daa91b9b0a235ce9935f34932cc4
parentdf4efdcf11519178d547ad446d0d9185a5f2428a
parent98cff89fba27b87a4a2b55d776faae008c3a1af0
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir