Squashed commit of the following:
[xonotic/xonotic-maps.pk3dir.git] / scripts / map_space-elevator.shader
2010-11-02 Rudolf PolzerMerge remote branch 'origin/fruitiex/nexballarena'
2010-11-02 FruitieXMerge branch 'master' into fruitiex/runningmanctf
2010-11-01 Rudolf PolzerMerge remote branch 'origin/mirceakitsune/red_planet'
2010-10-30 Rudolf PolzerMerge remote branch 'origin/fruitiex/stormkeep'
2010-10-30 Rudolf PolzerMerge remote branch 'origin/savagex/glowplant-warpzonefix'
2010-10-30 Rudolf PolzerSquashed commit of the following: