diff options
author | Adam Moss <moss@lindenlab.com> | 2009-08-31 17:16:21 +0000 |
---|---|---|
committer | Adam Moss <moss@lindenlab.com> | 2009-08-31 17:16:21 +0000 |
commit | 158946668a75a0dad7b53bc74fd2b6f8f4a4befc (patch) | |
tree | fdbd74ca881f5dd386c84496e393504c6b7eacb5 /indra/media_plugins/CMakeLists.txt | |
parent | 6dbef5f2a41d5ee974b808b8e863d4f973dfa2c3 (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/media_plugins/CMakeLists.txt')
-rw-r--r-- | indra/media_plugins/CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt index 09f8acdb52..d35afd8cbd 100644 --- a/indra/media_plugins/CMakeLists.txt +++ b/indra/media_plugins/CMakeLists.txt @@ -8,9 +8,4 @@ add_subdirectory(gstreamer010) if (WINDOWS OR DARWIN) add_subdirectory(quicktime) - add_subdirectory(awesomium) endif (WINDOWS OR DARWIN) - -if (WINDOWS) - add_subdirectory(flash_activex) -endif(WINDOWS) |