svn merge -r130875:131962...
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
Showing
- indra/cmake/WebKitLibPlugin.cmake 7 additions, 6 deletionsindra/cmake/WebKitLibPlugin.cmake
- indra/media_plugins/CMakeLists.txt 0 additions, 5 deletionsindra/media_plugins/CMakeLists.txt
- indra/media_plugins/webkit/CMakeLists.txt 3 additions, 3 deletionsindra/media_plugins/webkit/CMakeLists.txt
- indra/media_plugins/webkit/media_plugin_webkit.cpp 90 additions, 90 deletionsindra/media_plugins/webkit/media_plugin_webkit.cpp
- indra/newview/CMakeLists.txt 4 additions, 32 deletionsindra/newview/CMakeLists.txt
- indra/newview/skins/default/xui/en/mime_types.xml 0 additions, 11 deletionsindra/newview/skins/default/xui/en/mime_types.xml
- indra/newview/viewer_manifest.py 1 addition, 4 deletionsindra/newview/viewer_manifest.py
- indra/test_apps/llplugintest/CMakeLists.txt 2 additions, 24 deletionsindra/test_apps/llplugintest/CMakeLists.txt
- indra/test_apps/llplugintest/bookmarks.txt 0 additions, 10 deletionsindra/test_apps/llplugintest/bookmarks.txt
- indra/test_apps/llplugintest/llmediaplugintest.cpp 6 additions, 29 deletionsindra/test_apps/llplugintest/llmediaplugintest.cpp
- install.xml 29 additions, 68 deletionsinstall.xml
Loading
Please register or sign in to comment