diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:16 -0500 |
| commit | 12bc7eb0179d3154f929252c7ff95a4e8e244c0d (patch) | |
| tree | f2d1298f1301b26c7f7061803241fef300e39450 /indra/newview | |
| parent | 2b44c8919f7e0ed58c7ae1ee782d8ff419382c03 (diff) | |
| parent | cc3f0d287c7edb9e4cfe18985f2758e815502440 (diff) | |
merge changes for storm-823
Diffstat (limited to 'indra/newview')
| -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 |