Automated merge with ssh://bitbucket.org/lindenlab/viewer-skip-llcorehttp-test
No related branches found
No related tags found
Showing
- .hgignore 2 additions, 0 deletions.hgignore
- BuildParams 10 additions, 23 deletionsBuildParams
- autobuild.xml 1333 additions, 337 deletionsautobuild.xml
- build.sh 42 additions, 43 deletionsbuild.sh
- indra/cmake/00-Common.cmake 29 additions, 23 deletionsindra/cmake/00-Common.cmake
- indra/cmake/BuildPackagesInfo.cmake 9 additions, 1 deletionindra/cmake/BuildPackagesInfo.cmake
- indra/cmake/CMakeLists.txt 0 additions, 5 deletionsindra/cmake/CMakeLists.txt
- indra/cmake/ConfigurePkgConfig.cmake 3 additions, 3 deletionsindra/cmake/ConfigurePkgConfig.cmake
- indra/cmake/Copy3rdPartyLibs.cmake 13 additions, 30 deletionsindra/cmake/Copy3rdPartyLibs.cmake
- indra/cmake/GLEXT.cmake 1 addition, 1 deletionindra/cmake/GLEXT.cmake
- indra/cmake/GLH.cmake 1 addition, 1 deletionindra/cmake/GLH.cmake
- indra/cmake/Glui.cmake 0 additions, 28 deletionsindra/cmake/Glui.cmake
- indra/cmake/Glut.cmake 0 additions, 19 deletionsindra/cmake/Glut.cmake
- indra/cmake/GooglePerfTools.cmake 0 additions, 61 deletionsindra/cmake/GooglePerfTools.cmake
- indra/cmake/LLCommon.cmake 0 additions, 3 deletionsindra/cmake/LLCommon.cmake
- indra/cmake/QuickTimePlugin.cmake 0 additions, 48 deletionsindra/cmake/QuickTimePlugin.cmake
- indra/cmake/UI.cmake 2 additions, 2 deletionsindra/cmake/UI.cmake
- indra/cmake/Variables.cmake 39 additions, 33 deletionsindra/cmake/Variables.cmake
- indra/llcommon/CMakeLists.txt 3 additions, 8 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/llallocator.cpp 0 additions, 43 deletionsindra/llcommon/llallocator.cpp
Loading
Please register or sign in to comment