From: Rudolf Polzer Date: Tue, 25 Oct 2011 18:22:58 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~35^2~81 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8830a8313c28a07be1eaf5c5fd58a78cef3accd4;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 8830a8313c28a07be1eaf5c5fd58a78cef3accd4