diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 18:29:59 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 18:29:59 -0700 |
| commit | 33c230b46d17a2064994991763643a239e12e2c2 (patch) | |
| tree | 3af380efd9b3f67b26cc8b3c9c5a0fdd1549dd6d /indra/newview/skins/default/xui/pt/floater_media_browser.xml | |
| parent | 9b86d4c12f5f29d0bca5354d4e1ac6b5c828a327 (diff) | |
A few more merge error fixes.
Diffstat (limited to 'indra/newview/skins/default/xui/pt/floater_media_browser.xml')
0 files changed, 0 insertions, 0 deletions