Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
No related branches found
No related tags found
Showing
- .hgtags 18 additions, 1 deletion.hgtags
- autobuild.xml 12 additions, 12 deletionsautobuild.xml
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/cmake/LLAddBuildTest.cmake 0 additions, 0 deletionsindra/cmake/LLAddBuildTest.cmake
- indra/llcommon/lluuid.cpp 28 additions, 9 deletionsindra/llcommon/lluuid.cpp
- indra/llcommon/lluuid.h 3 additions, 0 deletionsindra/llcommon/lluuid.h
- indra/llcommon/llversionviewer.h 1 addition, 1 deletionindra/llcommon/llversionviewer.h
- indra/llcrashlogger/llcrashlogger.cpp 1 addition, 1 deletionindra/llcrashlogger/llcrashlogger.cpp
- indra/llmessage/llavatarnamecache.cpp 3 additions, 4 deletionsindra/llmessage/llavatarnamecache.cpp
- indra/llmessage/tests/llhttpclient_test.cpp 21 additions, 15 deletionsindra/llmessage/tests/llhttpclient_test.cpp
- indra/llplugin/slplugin/CMakeLists.txt 1 addition, 2 deletionsindra/llplugin/slplugin/CMakeLists.txt
- indra/llplugin/slplugin/slplugin-objc.h 21 additions, 3 deletionsindra/llplugin/slplugin/slplugin-objc.h
- indra/llplugin/slplugin/slplugin-objc.mm 98 additions, 3 deletionsindra/llplugin/slplugin/slplugin-objc.mm
- indra/llplugin/slplugin/slplugin.cpp 22 additions, 109 deletionsindra/llplugin/slplugin/slplugin.cpp
- indra/llui/llscrolllistctrl.cpp 9 additions, 0 deletionsindra/llui/llscrolllistctrl.cpp
- indra/llvfs/CMakeLists.txt 4 additions, 2 deletionsindra/llvfs/CMakeLists.txt
- indra/llvfs/lldir.h 1 addition, 3 deletionsindra/llvfs/lldir.h
- indra/llvfs/lldir_linux.cpp 1 addition, 1 deletionindra/llvfs/lldir_linux.cpp
- indra/llvfs/lldir_linux.h 1 addition, 1 deletionindra/llvfs/lldir_linux.h
- indra/llvfs/lldir_mac.cpp 71 additions, 166 deletionsindra/llvfs/lldir_mac.cpp
Loading
Please register or sign in to comment