summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2010-11-19 16:17:26 -0500
committerprep linden <prep@lindenlab.com>2010-11-19 16:17:26 -0500
commit6b0d10975b0ec00b374554ecd3b211e0d966272b (patch)
tree680f653b05fa0a12c8957c5f334e55e864e6af5a /indra/newview/app_settings
parent292941ac947d0ef07431a3addcfbe72287031cc4 (diff)
parentb5585a2d551190a5445581ced09be5fe906a0b53 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/settings.xml0
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