Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 05:37:39 +0000 (07:37 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 05:37:39 +0000 (07:37 +0200)
commit71bf8a752df0b2a0dc2f9476691525d0631b1238
treec56d3ee69d4aface9010b5b3b35dc698c15c65d9
parent3b17327e70923409a0a132441ae26d7fabbeee99
parent2a8308e236e5471e8924d45a8797b693035785aa
Merge branch 'master' of de.git.xonotic.org/xonotic/xonotic-data.pk3dir