Merge branch 'master' into mirceakitsune/world_cubemaps
authorMario <mario.mario@y7mail.com>
Thu, 27 Nov 2014 03:58:59 +0000 (14:58 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 27 Nov 2014 03:58:59 +0000 (14:58 +1100)
1  2 
scripts/shaderlist.txt

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