Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
No related branches found
No related tags found
Showing
- autobuild.xml 157 additions, 121 deletionsautobuild.xml
- indra/cmake/00-COMPILE-LINK-RUN.txt 344 additions, 0 deletionsindra/cmake/00-COMPILE-LINK-RUN.txt
- indra/cmake/00-Common.cmake 1 addition, 1 deletionindra/cmake/00-Common.cmake
- indra/cmake/Boost.cmake 12 additions, 1 deletionindra/cmake/Boost.cmake
- indra/cmake/Copy3rdPartyLibs.cmake 5 additions, 24 deletionsindra/cmake/Copy3rdPartyLibs.cmake
- indra/cmake/FreeType.cmake 1 addition, 1 deletionindra/cmake/FreeType.cmake
- indra/cmake/GStreamer010Plugin.cmake 1 addition, 1 deletionindra/cmake/GStreamer010Plugin.cmake
- indra/cmake/GoogleMock.cmake 1 addition, 1 deletionindra/cmake/GoogleMock.cmake
- indra/cmake/LLPrimitive.cmake 22 additions, 5 deletionsindra/cmake/LLPrimitive.cmake
- indra/cmake/Linking.cmake 1 addition, 0 deletionsindra/cmake/Linking.cmake
- indra/cmake/OpenSSL.cmake 2 additions, 2 deletionsindra/cmake/OpenSSL.cmake
- indra/cmake/PNG.cmake 19 additions, 6 deletionsindra/cmake/PNG.cmake
- indra/cmake/WebKitLibPlugin.cmake 25 additions, 18 deletionsindra/cmake/WebKitLibPlugin.cmake
- indra/cmake/ZLIB.cmake 17 additions, 4 deletionsindra/cmake/ZLIB.cmake
- indra/edit-me-to-trigger-new-build.txt 1 addition, 0 deletionsindra/edit-me-to-trigger-new-build.txt
- indra/llcommon/CMakeLists.txt 1 addition, 1 deletionindra/llcommon/CMakeLists.txt
- indra/media_plugins/webkit/CMakeLists.txt 6 additions, 6 deletionsindra/media_plugins/webkit/CMakeLists.txt
- indra/newview/CMakeLists.txt 28 additions, 1 deletionindra/newview/CMakeLists.txt
- indra/newview/icons/beta/secondlife_128.png 0 additions, 0 deletionsindra/newview/icons/beta/secondlife_128.png
- indra/newview/icons/beta/secondlife_16.png 0 additions, 0 deletionsindra/newview/icons/beta/secondlife_16.png
Loading
Please register or sign in to comment