merge

.hgtags

autobuild.xml

doc/contributions.txt

indra/cmake/BuildPackagesInfo.cmake

indra/llcommon/llfasttimer.h

indra/llcommon/llmortician.cpp

indra/llcommon/llmortician.h

indra/llui/lltransutil.cpp

indra/llvfs/lldir.cpp

indra/llvfs/lldir.h

indra/llwindow/llappdelegate-objc.h

indra/llwindow/llopenglview-objc.mm

indra/newview/CMakeLists.txt

indra/newview/installers/windows/lang_en-us.nsi

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llappdelegate-objc.mm

indra/newview/llappviewer.cpp

indra/newview/llappviewerwin32.cpp

indra/newview/llcofwearables.cpp