Merge remote branch 'origin/master' into diabolik/facility114-team
[xonotic/xonotic-maps.pk3dir.git] / textures / decals / scorch01_norm.tga
2010-05-23 Jakob MGAdd decals shader & textures