diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2014-02-12 18:15:32 -0700 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2014-02-12 18:15:32 -0700 |
commit | 89d5cef757b4665b3a700dbb39c2e396298dca9c (patch) | |
tree | 9d0f13cf5b9c004f7879686bb098ef5132b668e4 /indra/newview/app_settings/settings.xml | |
parent | 5866bb7ef09b786f8f195770a70dc4289d183ca0 (diff) | |
parent | f5a63ed31e499903f3d6ff5009d20f980b4fe860 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
0 files changed, 0 insertions, 0 deletions