diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-05-26 10:42:45 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-05-26 10:42:45 -0400 |
commit | 99bd9bb56ba8d834c91955940801b6d2ac46e627 (patch) | |
tree | 5021ca8672de2890c86ef61d65104c9cc66ab009 /indra/newview/app_settings/llsd.xsd | |
parent | a6fa155725205d1e6207abfe1112f92bbe38203d (diff) | |
parent | fda331bb801918aab3eb5b7026f7e868eca248a2 (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/app_settings/llsd.xsd')
0 files changed, 0 insertions, 0 deletions