summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-03-04 16:43:54 -0500
committerOz Linden <oz@lindenlab.com>2016-03-04 16:43:54 -0500
commitef514c800159218eca634d199890d835bb118353 (patch)
treeca9156a495a155d763987be8c9e9a11f27e001c2 /indra/newview/app_settings
parent09f43945d598b50a31bdbe4a3f86c73d909ec9bc (diff)
parent8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff)
merge changes for MAINT-5360
Diffstat (limited to 'indra/newview/app_settings')
0 files changed, 0 insertions, 0 deletions