summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-03-30 16:10:40 -0400
committerOz Linden <oz@lindenlab.com>2012-03-30 16:10:40 -0400
commitcaa780e49740e8e9d707ad8ba6a302be8d4d20d9 (patch)
tree7de3e64b49001ad7f9cfe83855bc5387b07e326c /indra/newview/app_settings
parent74d199c1dd10660f72293c84888af412764f1da8 (diff)
parentade89007a89575ca0d3563a1aa08c7d20e30fcce (diff)
merge changes for vmrg-229
Diffstat (limited to 'indra/newview/app_settings')
0 files changed, 0 insertions, 0 deletions