diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:40:25 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:40:25 -0500 |
commit | 67ced403e624599f23020c8b8bd802947e602d31 (patch) | |
tree | 6fe5a73a41c30f3d718e9c4c1fe54fe940316d3b /indra/newview/app_settings | |
parent | 67231c854e317e4439d350d7ea97245402b88b1c (diff) | |
parent | 7a2f0ba9a8d7f6126d9c695d63f7efa65b479788 (diff) |
merge changes for storm-513
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 |