summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2011-01-05 16:12:15 -0500
committerprep <prep@lindenlab.com>2011-01-05 16:12:15 -0500
commitc9f3a5574e223bec95b4ec374fd164ba9a486c2a (patch)
treeedbd6574b4133488f82e872bb86d3aacda4af216 /indra/newview/app_settings
parent5b09da5079d576678eb5d66a5518044d1b22664f (diff)
parent7c7527b6727a6070fd7679ea28e4e2692452bf27 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-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