From: Rudolf Polzer Date: Sat, 26 Nov 2011 11:39:28 +0000 (+0100) Subject: Merge branch 'master' into divVerent/csqcmodel X-Git-Tag: xonotic-v0.6.0~74^2~100^2~41 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=b3cdb8ea20b79947cd65935ef70997edc00ed2f6;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/csqcmodel --- b3cdb8ea20b79947cd65935ef70997edc00ed2f6