From: Rudolf Polzer Date: Sat, 25 Sep 2010 13:01:39 +0000 (+0200) Subject: Merge branch 'master' into cbrutail/shaders_fx_xonotic2 X-Git-Tag: xonotic-v0.1.0preview~151 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=1ea555a9d408babd4de4ecca329779ceba48396a;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into cbrutail/shaders_fx_xonotic2 --- 1ea555a9d408babd4de4ecca329779ceba48396a