From: Rudolf Polzer Date: Wed, 21 Jul 2010 11:10:50 +0000 (+0200) Subject: Merge branch 'master' into cbrutail/shaders_fx_xonotic2 X-Git-Tag: xonotic-v0.1.0preview~152 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=594f0b77f88f05a5a46760af07693babc1802789;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into cbrutail/shaders_fx_xonotic2 --- 594f0b77f88f05a5a46760af07693babc1802789