From: Rudolf Polzer Date: Sat, 29 Jan 2011 20:26:18 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~316^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7070c733dae8f9a1ae04903615fa41ef14e52e21;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 7070c733dae8f9a1ae04903615fa41ef14e52e21