summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-06 14:31:17 -0500
committerOz Linden <oz@lindenlab.com>2011-01-06 14:31:17 -0500
commita9686db3e606ec45d23265fd34a1a35498f39857 (patch)
treeb20758ac0beda679834eafbcdd203780449be334 /indra/newview/app_settings/shaders
parent7105d98e24185f9ce31be1fe1b26c3ae1552e71f (diff)
parent1034db639462d95e54e9bf9e4d63500b745bb0a2 (diff)
merge changes for storm-438
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