diff options
| author | Aleric Inglewood | 2010-10-15 17:49:06 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-15 17:49:06 +0200 |
| commit | 67f55bad571044535f1d8c3b3c3afb5078249fd3 (patch) | |
| tree | d5e9f43ed6b44837faed947a09b13648d55087ba /linden/indra/newview/skins | |
| parent | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewe... (diff) | |
| download | meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.zip meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.gz meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.bz2 meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.xz | |
RED-595: Manual merge with weekly-webkit.
Plus some white space fixes (TABs --> spaces) in install.xml.
Diffstat (limited to 'linden/indra/newview/skins')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/zh/mime_types.xml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types.xml b/linden/indra/newview/skins/default/xui/zh/mime_types.xml index fc5fae4..0cc6f2f 100644 --- a/linden/indra/newview/skins/default/xui/zh/mime_types.xml +++ b/linden/indra/newview/skins/default/xui/zh/mime_types.xml | |||
| @@ -1,14 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
| 2 | <mimetypes name="default"> | 2 | <mimetypes name="default"> |
| 3 | <defaultlabel> | ||
| 4 | (未知) | ||
| 5 | </defaultlabel> | ||
| 6 | <defaultwidget> | ||
| 7 | 无 | ||
| 8 | </defaultwidget> | ||
| 9 | <defaultimpl> | ||
| 10 | LLMediaImplLLMozLib | ||
| 11 | </defaultimpl> | ||
| 12 | <widgetset name="web"> | 3 | <widgetset name="web"> |
| 13 | <label name="web_label"> | 4 | <label name="web_label"> |
| 14 | 网页内容 | 5 | 网页内容 |