Merge branch 'master' into cbrutail/decals-xonotic
[xonotic/xonotic-maps.pk3dir.git] / textures / effects_healpod /
2010-09-28 Rudolf PolzerMerge commit 'c87167c'
2010-09-25 Rudolf Polzeradapt to shader naming convention