Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Mon, 24 Sep 2012 09:54:35 +0000 (11:54 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 24 Sep 2012 09:54:35 +0000 (11:54 +0200)
commitecf8a2ba1caa9fe51bb1083659b4db88ee6a6645
tree4f847668f2229f4b2ba929eebce796ec66442052
parente24739c7c75cd030c2d4a70aa222ff515383ca02
parentaf7d1b3e8b982bffd83ebb33152f17699b83a7fa
Merge branch 'master' of de.git.xonotic.org/xonotic/xonotic-data.pk3dir