From: Rudolf Polzer Date: Wed, 3 Nov 2010 08:06:42 +0000 (+0100) Subject: Merge branch 'master' into cbrutail/decals-xonotic X-Git-Tag: xonotic-v0.1.0preview~45^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5157a76853b3f2cad0b01d24709fd164ce46bd4a;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into cbrutail/decals-xonotic --- 5157a76853b3f2cad0b01d24709fd164ce46bd4a