diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-16 09:08:28 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-16 09:08:28 -0500 |
commit | 222bda14b6bafb0a62b6d4fac7ec815dea65b4e6 (patch) | |
tree | f80bd20f6bcf19492797feccbc7bb2adaadb98c1 /indra/newview/app_settings | |
parent | 80561014b0c30b6e3ce04f0a23daed612f3c4075 (diff) | |
parent | 3ea3d4cf16894c928cd60c19429dbec158185f96 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-x[-rw-r--r--] | 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 5cc8c34cd5..5cc8c34cd5 100644..100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml |