From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 5 Apr 2012 15:53:00 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/world_cubemaps
X-Git-Tag: xonotic-v0.8.0~5^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31a33d973a5355491251e7bab063a22a3cc1fa4d;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into mirceakitsune/world_cubemaps
---

31a33d973a5355491251e7bab063a22a3cc1fa4d
diff --cc scripts/shaderlist.txt
index 24ac2cab,57226fa3..91c8ae41
--- a/scripts/shaderlist.txt
+++ b/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