diff options
author | Rider Linden <rider@lindenlab.com> | 2018-10-09 16:50:26 +0000 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-10-09 16:50:26 +0000 |
commit | 6f54ebe1c1e6be356740a27eb4035e8c65889d56 (patch) | |
tree | 500f50222e268c2f2da30f132106eaf4e547087a /indra/newview/skins/default/xui/pl/floater_media_settings.xml | |
parent | 0a4ddfffdc2d77a8dc330bcddeda06a505724bfa (diff) | |
parent | 4062aba1d0ff9027dcaa76b0a362cf3e54066ff4 (diff) |
Merged in maxim_productengine/viewer-eep (pull request #136)
SL-9817 and SL-9820
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/skins/default/xui/pl/floater_media_settings.xml')
0 files changed, 0 insertions, 0 deletions