diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-07-19 10:18:57 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-07-19 10:18:57 -0400 |
commit | 5b8c1851f2b565fddaab28e23add62f621f15082 (patch) | |
tree | d8525d0f5dd985efb86dcb50e752e19d59a7fb2d /indra/newview/app_settings | |
parent | 94fde578cd845b1a648e66ecf184e7a24beaad6d (diff) | |
parent | 3bb5d368a21e2645222f0f5fa57b0a0abb236084 (diff) |
automated merge
Diffstat (limited to 'indra/newview/app_settings')
0 files changed, 0 insertions, 0 deletions