diff options
author | Oz Linden <oz@lindenlab.com> | 2013-07-15 15:37:45 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-07-15 15:37:45 -0400 |
commit | c18c1f2defa8109f07a5cd758dce2f6f9333c333 (patch) | |
tree | 5bb4b32f856aa5bff4e47c499eec75803c083d22 /indra/newview/app_settings/settings.xml | |
parent | 337286cb34a3d8b1842359f3381dfc27619d222a (diff) | |
parent | 00cd82e3e56554175a4fe2faffd129bbe669185d (diff) |
merge changes for storm-1952
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
0 files changed, 0 insertions, 0 deletions