diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-01-21 11:08:25 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-01-21 11:08:25 -0800 |
| commit | 4eb6d5502c97b862beab9c2364d5d99700f6e852 (patch) | |
| tree | 05f3942db4b9d16024ec2a3fa742ecfd96b75888 /indra/newview/skins/default/xui/pt/floater_media_settings.xml | |
| parent | b94ddeaa46c1f754c6b0b900fd3094aabe66e084 (diff) | |
| parent | ee66cb86274c53122d8bcaebb5cd822a88f92376 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/skins/default/xui/pt/floater_media_settings.xml')
0 files changed, 0 insertions, 0 deletions