]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1e7483 e6e45ec)
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 patch | diff1 | diff2 | blob | history

diff --cc scripts/shaderlist.txt
index 24ac2cabd2fb5e4153d673027e3b66e20b059ee7,57226fa3c5c6139fb3699fb3402a00e284367215..91c8ae41ce8eb03d046eadd1fdb9305e7c690b66
--- 1/scripts/shaderlist.txt
--- 2/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