summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-30 16:30:36 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-30 16:30:36 -0500
commite68b03260ffdf786f609ace72ba1f63ce0913b2c (patch)
treefd801ec06335331dc03638eb670a7cae2e10a471 /indra/newview/app_settings/shaders
parentfad456e2b13fab83206240d7973dd2529b53de9e (diff)
parentcc3f0d287c7edb9e4cfe18985f2758e815502440 (diff)
Automated merge up from viewer-development
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