summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2009-08-31 17:16:21 +0000
committerAdam Moss <moss@lindenlab.com>2009-08-31 17:16:21 +0000
commit158946668a75a0dad7b53bc74fd2b6f8f4a4befc (patch)
treefdbd74ca881f5dd386c84496e393504c6b7eacb5 /indra/newview/skins/default
parent6dbef5f2a41d5ee974b808b8e863d4f973dfa2c3 (diff)
svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/mime_types.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index 804bee6cd1..2de9449ea6 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -230,17 +230,6 @@
image
</widgettype>
</mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- <widgettype>
- image
- </widgettype>
- <impl>
- media_plugin_flash_activex
- </impl>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)