summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-05-26 12:04:26 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-05-26 12:04:26 -0400
commitc7b6ab820800d91d62ac292c7a1fe2ef12b3c5e1 (patch)
treecaadb7a70c0a470e445e39b0aa57081bd33eda73 /indra/newview/skins
parent14418c197076d0eb01bb0852b8716fa966bc9d53 (diff)
parent946af937d7743656197afcfc1a4239ac71a438f1 (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