diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-02-23 16:24:47 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-02-23 16:24:47 -0500 |
commit | 3d77dd6b5806bededd6b71402f71b9f0675c27c7 (patch) | |
tree | 5bc5fe4f3ecd3076b6b10742be252b2ff5df4a63 /indra/newview/app_settings/settings_files.xml | |
parent | 701b665ee567c8ff639fbc4b8794b9b0912a5256 (diff) |
Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually.
Diffstat (limited to 'indra/newview/app_settings/settings_files.xml')
0 files changed, 0 insertions, 0 deletions