From: Mario <mario.mario@y7mail.com>
Date: Thu, 27 Nov 2014 03:58:59 +0000 (+1100)
Subject: Merge branch 'master' into mirceakitsune/world_cubemaps
X-Git-Tag: xonotic-v0.8.0~5^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f1bf044c353dce87bdd1b4a9ea1a811e332a704;p=xonotic%2Fxonotic-maps.pk3dir.git

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

8f1bf044c353dce87bdd1b4a9ea1a811e332a704
diff --cc scripts/shaderlist.txt
index 91c8ae41,41176210..68284e9e
--- a/scripts/shaderlist.txt
+++ b/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