summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-06 14:33:35 -0500
committerOz Linden <oz@lindenlab.com>2011-01-06 14:33:35 -0500
commit894e98a708f4135cb4543b95ce46c2b8c4929393 (patch)
tree2055d289ca6c55eacb300feddb38b2935e8ae132 /indra/newview/app_settings/shaders
parent1ca028cd7b2b4a169cdc776dfa4b38b2fcb76440 (diff)
parent94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (diff)
merge changes for storm-812
Diffstat (limited to 'indra/newview/app_settings/shaders')
-rw-r--r--indra/newview/app_settings/shaders/shader_hierarchy.txt (renamed from indra/newview/app_settings/shaders/shader_heirarchy.txt)0
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/shader_heirarchy.txt b/indra/newview/app_settings/shaders/shader_hierarchy.txt
index d8bbf69b38..d8bbf69b38 100644
--- a/indra/newview/app_settings/shaders/shader_heirarchy.txt
+++ b/indra/newview/app_settings/shaders/shader_hierarchy.txt