merge changes for 4.0.1-release
No related branches found
No related tags found
Showing
- .hgtags 2 additions, 0 deletions.hgtags
- BuildParams 6 additions, 3 deletionsBuildParams
- autobuild.xml 37 additions, 107 deletionsautobuild.xml
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/CMakeLists.txt 0 additions, 6 deletionsindra/CMakeLists.txt
- indra/cmake/00-Common.cmake 3 additions, 0 deletionsindra/cmake/00-Common.cmake
- indra/cmake/CEFPlugin.cmake 40 additions, 0 deletionsindra/cmake/CEFPlugin.cmake
- indra/cmake/CMakeLists.txt 4 additions, 4 deletionsindra/cmake/CMakeLists.txt
- indra/cmake/Linking.cmake 1 addition, 1 deletionindra/cmake/Linking.cmake
- indra/cmake/Variables.cmake 1 addition, 1 deletionindra/cmake/Variables.cmake
- indra/cmake/WebKitLibPlugin.cmake 0 additions, 93 deletionsindra/cmake/WebKitLibPlugin.cmake
- indra/lib/python/indra/util/llmanifest.py 29 additions, 27 deletionsindra/lib/python/indra/util/llmanifest.py
- indra/llmessage/llcurl.cpp 5 additions, 0 deletionsindra/llmessage/llcurl.cpp
- indra/llmessage/llcurl.h 1 addition, 0 deletionsindra/llmessage/llcurl.h
- indra/llplugin/CMakeLists.txt 1 addition, 2 deletionsindra/llplugin/CMakeLists.txt
- indra/llplugin/llpluginclassmedia.cpp 149 additions, 130 deletionsindra/llplugin/llpluginclassmedia.cpp
- indra/llplugin/llpluginclassmedia.h 9 additions, 2 deletionsindra/llplugin/llpluginclassmedia.h
- indra/llplugin/llpluginclassmediaowner.h 2 additions, 0 deletionsindra/llplugin/llpluginclassmediaowner.h
- indra/llplugin/llpluginprocesschild.cpp 31 additions, 12 deletionsindra/llplugin/llpluginprocesschild.cpp
- indra/llplugin/llpluginprocesschild.h 4 additions, 3 deletionsindra/llplugin/llpluginprocesschild.h
Loading
Please register or sign in to comment