summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-03-18 11:46:12 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-03-18 11:46:12 -0400
commit409e9202dd47bd03e6bef6deb1224f8c1a4550bc (patch)
tree0ee024f041f5c3f838bd34d45dc67729c5d13df0 /indra/newview/app_settings
parent605a99010fb534868e4c0abef1da09c8bcfbb884 (diff)
parente288ff9695f4f2fbfc0f3963985c6e0fa61f6403 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/logcontrol.xml0
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index c5561166fc..c5561166fc 100644..100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml