Merge branch 'master' into mirceakitsune/world_cubemaps
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 5 Apr 2012 15:53:00 +0000 (18:53 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 5 Apr 2012 15:53:00 +0000 (18:53 +0300)
1  2 
scripts/shaderlist.txt

@@@ -11,10 -11,8 +11,9 @@@ effects_warpzon
  ex2x
  exomorphx
  exx
 +exx_reflections_off
  facility114invx
  facility114x
- grass
  liquids_lava
  liquids_slime
  liquids_water