Squashed commit of the following:
[xonotic/xonotic-maps.pk3dir.git] / scripts / model_desertfactory.shader
2010-10-02 FruitieXMerge remote branch 'origin/divVerent/fruitiex-textures...
2010-10-02 FruitieXMerge remote branch 'origin/master' into fruitiex/runni...
2010-10-02 Rudolf PolzerMerge remote branch 'origin/fruitiex/effect_e8circle'
2010-10-02 Rudolf Polzerremove unused shaders
2010-10-01 Rudolf Polzerimport desertfactory assets