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