summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-05-26 18:22:15 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-05-26 18:22:15 -0400
commitb2433a6c82980e76dfde8735d69b788d20abc9d8 (patch)
tree56598d9bec26b54d3ba1a3896ac2cf52c2af139f /indra/newview/skins
parent14b8471d448a6e591ab29d25634a32d882853212 (diff)
parentec7dbc704040dfcdcd101f090dbb2f780ca0ee8a (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_wearable.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 71f740590b..0455086ef3 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -107,7 +107,7 @@ left="0"
Jacket:
</string>
<string
- name="skirt_skirt_desc_text">
+ name="skirt_desc_text">
Skirt:
</string>
<string