diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
| commit | c7ebeb842010c4a814978f63c464e1546bd6a9be (patch) | |
| tree | de77b0d9a9fe53ff35d660b0e8731b91abe2ff94 /indra/newview/app_settings/windlight/water | |
| parent | 8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff) | |
| parent | 4fd57774dd8491ffc760114b6d89fd0ab1989bbd (diff) | |
merge with El Capitan and packaging fixes
Diffstat (limited to 'indra/newview/app_settings/windlight/water')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/windlight/water/Default.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/windlight/water/Glassy.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/windlight/water/Murky.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/windlight/water/Pond.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/windlight/water/Second%20Plague.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/windlight/water/Valdez.xml | 0 |
7 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/app_settings/windlight/water/Default.xml b/indra/newview/app_settings/windlight/water/Default.xml index dce4148c7d..dce4148c7d 100755..100644 --- a/indra/newview/app_settings/windlight/water/Default.xml +++ b/indra/newview/app_settings/windlight/water/Default.xml diff --git a/indra/newview/app_settings/windlight/water/Glassy.xml b/indra/newview/app_settings/windlight/water/Glassy.xml index 01183e4687..01183e4687 100755..100644 --- a/indra/newview/app_settings/windlight/water/Glassy.xml +++ b/indra/newview/app_settings/windlight/water/Glassy.xml diff --git a/indra/newview/app_settings/windlight/water/Murky.xml b/indra/newview/app_settings/windlight/water/Murky.xml index 1d9e022422..1d9e022422 100755..100644 --- a/indra/newview/app_settings/windlight/water/Murky.xml +++ b/indra/newview/app_settings/windlight/water/Murky.xml diff --git a/indra/newview/app_settings/windlight/water/Pond.xml b/indra/newview/app_settings/windlight/water/Pond.xml index 59e3c441ea..59e3c441ea 100755..100644 --- a/indra/newview/app_settings/windlight/water/Pond.xml +++ b/indra/newview/app_settings/windlight/water/Pond.xml diff --git a/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml b/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml index 6dbc4e8719..6dbc4e8719 100755..100644 --- a/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml +++ b/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml diff --git a/indra/newview/app_settings/windlight/water/Second%20Plague.xml b/indra/newview/app_settings/windlight/water/Second%20Plague.xml index 137483ab64..137483ab64 100755..100644 --- a/indra/newview/app_settings/windlight/water/Second%20Plague.xml +++ b/indra/newview/app_settings/windlight/water/Second%20Plague.xml diff --git a/indra/newview/app_settings/windlight/water/Valdez.xml b/indra/newview/app_settings/windlight/water/Valdez.xml index eb70a142e0..eb70a142e0 100755..100644 --- a/indra/newview/app_settings/windlight/water/Valdez.xml +++ b/indra/newview/app_settings/windlight/water/Valdez.xml |