diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-30 16:00:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-30 16:00:09 -0400 |
| commit | 06b314aaf2d1d1176c846a3bdb17738de98252b7 (patch) | |
| tree | e6fbc2b8375dfcbbab9d4e9c65935a3b38eeeda9 /indra/newview/app_settings/settings.xml | |
| parent | 5c77e714a6febf9df23d8541064e0d2fe680ccce (diff) | |
| parent | f07173a9689237bf2d8218600c15d6bf4d047cdc (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/settings.xml | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index efe605e5e6..efe605e5e6 100755..100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml |