diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 09:41:10 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 09:41:10 -0400 |
commit | 4bce553a96dc6d75279f2c2b35fb8060a3f6bae1 (patch) | |
tree | 70c1b0c2b43f2649777eb8cac7eb927906034640 /indra/newview/skins/default/xui/en/floater_media_settings.xml | |
parent | a1fb8ae0d0679499a68fb8dd1965ab5026878c73 (diff) | |
parent | 662a92784328f31b680f4f049350dd0f6cacf4c7 (diff) |
merge viewer-development -> mesh-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_media_settings.xml')
0 files changed, 0 insertions, 0 deletions