Merge branch 'master' into divVerent/fruitiex-textures
[xonotic/xonotic-maps.pk3dir.git] / textures / proceduralx /
2010-09-29 Rudolf PolzerMerge branch 'master' into divVerent/fruitiex-textures
2010-09-28 Rudolf Polzeradapt to shader naming convention