Automated merge with file:///Users/nat/linden/viewer-maint-1144
Showing
- .hgignore 1 addition, 0 deletions.hgignore
- .hgtags 69 additions, 0 deletions.hgtags
- BuildParams 20 additions, 48 deletionsBuildParams
- autobuild.xml 6 additions, 6 deletionsautobuild.xml
- build.sh 10 additions, 8 deletionsbuild.sh
- doc/contributions.txt 55 additions, 1 deletiondoc/contributions.txt
- indra/cmake/00-Common.cmake 2 additions, 2 deletionsindra/cmake/00-Common.cmake
- indra/cmake/JsonCpp.cmake 1 addition, 1 deletionindra/cmake/JsonCpp.cmake
- indra/cmake/Linking.cmake 9 additions, 2 deletionsindra/cmake/Linking.cmake
- indra/cmake/VisualLeakDetector.cmake 15 additions, 0 deletionsindra/cmake/VisualLeakDetector.cmake
- indra/cmake/WebKitLibPlugin.cmake 4 additions, 3 deletionsindra/cmake/WebKitLibPlugin.cmake
- indra/edit-me-to-trigger-new-build.txt 0 additions, 0 deletionsindra/edit-me-to-trigger-new-build.txt
- indra/linux_crash_logger/llcrashloggerlinux.cpp 0 additions, 0 deletionsindra/linux_crash_logger/llcrashloggerlinux.cpp
- indra/linux_crash_logger/llcrashloggerlinux.h 0 additions, 0 deletionsindra/linux_crash_logger/llcrashloggerlinux.h
- indra/llaudio/llaudiodecodemgr.cpp 1 addition, 1 deletionindra/llaudio/llaudiodecodemgr.cpp
- indra/llaudio/llaudioengine.cpp 19 additions, 4 deletionsindra/llaudio/llaudioengine.cpp
- indra/llaudio/llaudioengine.h 2 additions, 0 deletionsindra/llaudio/llaudioengine.h
- indra/llcharacter/llbvhloader.cpp 1 addition, 1 deletionindra/llcharacter/llbvhloader.cpp
- indra/llcharacter/llcharacter.h 1 addition, 1 deletionindra/llcharacter/llcharacter.h
- indra/llcommon/linden_common.h 0 additions, 23 deletionsindra/llcommon/linden_common.h
Loading
Please register or sign in to comment