diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-03-23 22:34:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-03-23 22:34:34 -0400 |
| commit | 794ae5cdcadcfaa655815bfa1e6c6823e03ee1f6 (patch) | |
| tree | df04ccbc14141952e12797fb5d7860fae4eaf18a /indra/newview/skins/default/xui/zh/floater_event.xml | |
| parent | 8e21b24a079684304b02485d8f28e9be8f16e6a0 (diff) | |
correct merge error
Diffstat (limited to 'indra/newview/skins/default/xui/zh/floater_event.xml')
0 files changed, 0 insertions, 0 deletions