diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-09 12:16:00 -0700 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-09 12:16:00 -0700 |
commit | b6571ee127f22316be8b9e32c771f8bfb35a0b00 (patch) | |
tree | f84ac9bb03c58f7f2b985e24f8854da83cb6f7d5 /indra/newview/app_settings/settings.xml | |
parent | 09b009fc23e75c8403cc9879f7f839d9e2656c02 (diff) | |
parent | 8d43cb270185a53e0a419f7cd52af583129bbbde (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
0 files changed, 0 insertions, 0 deletions