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/viewer_manifest.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'indra/newview/viewer_manifest.py')
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d175a26531..b743954420 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -487,10 +487,7 @@ class DarwinManifest(ViewerManifest):
self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin")
self.path("../media_plugins/quicktime/" + self.args['configuration'] + "/media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib")
self.path("../media_plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.dylib")
- self.path("../../libraries/universal-darwin/lib_release/libllwebkitlib.dylib", "libllwebkitlib.dylib")
-
- self.path("../media_plugins/awesomium/" + self.args['configuration'] + "/media_plugin_awesomium.dylib", "media_plugin_awesomium.dylib")
- self.path("../../libraries/universal-darwin/lib_release/Awesomium.framework", "Awesomium.framework")
+ self.path("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib")
self.end_prefix("llplugin")
--
cgit v1.2.3