From: Rudolf Polzer Date: Tue, 6 Dec 2011 21:14:32 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~35^2~12 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0874b330f0ccab996c658c73c23e267626c7d2df;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 0874b330f0ccab996c658c73c23e267626c7d2df