From: Matthias Krüger Date: Wed, 3 Jul 2013 20:32:21 +0000 (+0200) Subject: Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow X-Git-Tag: xonotic-v0.8.0~37^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b579c6c43694c474ba90a44af2806be54f0faa10;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow --- b579c6c43694c474ba90a44af2806be54f0faa10