From 158946668a75a0dad7b53bc74fd2b6f8f4a4befc Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Mon, 31 Aug 2009 17:16:21 +0000
Subject: 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
---
 indra/newview/skins/default/xui/en/mime_types.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/skins/default')

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)
-- 
cgit v1.2.3