-
- Downloads
Merge branch 'master' into DRTVWR-513-maint
# Conflicts: # indra/llcommon/llerror.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp
No related branches found
No related tags found
Showing
- .gitignore 7 additions, 4 deletions.gitignore
- autobuild.xml 319 additions, 243 deletionsautobuild.xml
- build.sh 1 addition, 1 deletionbuild.sh
- indra/CMakeLists.txt 5 additions, 0 deletionsindra/CMakeLists.txt
- indra/cmake/00-Common.cmake 4 additions, 1 deletionindra/cmake/00-Common.cmake
- indra/cmake/Boost.cmake 57 additions, 53 deletionsindra/cmake/Boost.cmake
- indra/cmake/BuildPackagesInfo.cmake 2 additions, 1 deletionindra/cmake/BuildPackagesInfo.cmake
- indra/cmake/CMakeLists.txt 0 additions, 1 deletionindra/cmake/CMakeLists.txt
- indra/cmake/Copy3rdPartyLibs.cmake 61 additions, 110 deletionsindra/cmake/Copy3rdPartyLibs.cmake
- indra/cmake/DirectX.cmake 0 additions, 48 deletionsindra/cmake/DirectX.cmake
- indra/cmake/LLAddBuildTest.cmake 3 additions, 2 deletionsindra/cmake/LLAddBuildTest.cmake
- indra/cmake/LLAppearance.cmake 1 addition, 1 deletionindra/cmake/LLAppearance.cmake
- indra/cmake/LLCommon.cmake 2 additions, 2 deletionsindra/cmake/LLCommon.cmake
- indra/cmake/LLCoreHttp.cmake 1 addition, 1 deletionindra/cmake/LLCoreHttp.cmake
- indra/cmake/run_build_test.py 13 additions, 6 deletionsindra/cmake/run_build_test.py
- indra/integration_tests/llimage_libtest/CMakeLists.txt 1 addition, 0 deletionsindra/integration_tests/llimage_libtest/CMakeLists.txt
- indra/integration_tests/llui_libtest/CMakeLists.txt 1 addition, 0 deletionsindra/integration_tests/llui_libtest/CMakeLists.txt
- indra/linux_crash_logger/CMakeLists.txt 1 addition, 1 deletionindra/linux_crash_logger/CMakeLists.txt
- indra/llappearance/llwearabletype.cpp 35 additions, 32 deletionsindra/llappearance/llwearabletype.cpp
- indra/llappearance/llwearabletype.h 1 addition, 0 deletionsindra/llappearance/llwearabletype.h
Loading
Please register or sign in to comment