merge

.hgtags

BuildParams

autobuild.xml

indra/cmake/Boost.cmake

indra/cmake/Copy3rdPartyLibs.cmake

indra/cmake/GooglePerfTools.cmake

indra/cmake/LLAddBuildTest.cmake

indra/edit-me-to-trigger-new-build.txt

indra/llcommon/CMakeLists.txt

indra/llcommon/fix_macros.h

indra/llcommon/linden_common.h

indra/llcommon/llsys.cpp

indra/llcommon/llversionviewer.h

indra/llcorehttp/CMakeLists.txt

indra/llcorehttp/_refcounted.h

indra/llcrashlogger/llcrashlogger.cpp

indra/llmessage/llavatarnamecache.cpp

indra/llplugin/slplugin/CMakeLists.txt

indra/llplugin/slplugin/slplugin-objc.h

indra/llplugin/slplugin/slplugin-objc.mm