Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175...
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
Showing
- doc/contributions.txt 4 additions, 0 deletionsdoc/contributions.txt
- indra/cmake/00-Common.cmake 8 additions, 5 deletionsindra/cmake/00-Common.cmake
- indra/cmake/APR.cmake 6 additions, 6 deletionsindra/cmake/APR.cmake
- indra/cmake/Audio.cmake 12 additions, 4 deletionsindra/cmake/Audio.cmake
- indra/cmake/Boost.cmake 6 additions, 6 deletionsindra/cmake/Boost.cmake
- indra/cmake/GooglePerfTools.cmake 5 additions, 0 deletionsindra/cmake/GooglePerfTools.cmake
- indra/cmake/JPEG.cmake 1 addition, 1 deletionindra/cmake/JPEG.cmake
- indra/cmake/LLRender.cmake 2 additions, 2 deletionsindra/cmake/LLRender.cmake
- indra/cmake/LLWindow.cmake 5 additions, 0 deletionsindra/cmake/LLWindow.cmake
- indra/cmake/Linking.cmake 5 additions, 0 deletionsindra/cmake/Linking.cmake
- indra/cmake/PNG.cmake 7 additions, 1 deletionindra/cmake/PNG.cmake
- indra/cmake/ZLIB.cmake 3 additions, 1 deletionindra/cmake/ZLIB.cmake
- indra/llcharacter/llbvhloader.cpp 6 additions, 3 deletionsindra/llcharacter/llbvhloader.cpp
- indra/llcharacter/llkeyframemotionparam.cpp 4 additions, 3 deletionsindra/llcharacter/llkeyframemotionparam.cpp
- indra/llcharacter/llstatemachine.cpp 3 additions, 3 deletionsindra/llcharacter/llstatemachine.cpp
- indra/llcommon/llapr.cpp 389 additions, 113 deletionsindra/llcommon/llapr.cpp
- indra/llcommon/llapr.h 102 additions, 22 deletionsindra/llcommon/llapr.h
- indra/llcommon/llcrc.cpp 4 additions, 0 deletionsindra/llcommon/llcrc.cpp
- indra/llcommon/llerror.cpp 123 additions, 0 deletionsindra/llcommon/llerror.cpp
- indra/llcommon/llerror.h 35 additions, 1 deletionindra/llcommon/llerror.h
Loading
Please register or sign in to comment