merge

.hgtags

build.sh

doc/contributions.txt

indra/cmake/BuildVersion.cmake

indra/llaudio/llaudioengine_fmodex.cpp

indra/llcommon/CMakeLists.txt

indra/llcommon/llcoros.cpp

indra/llcommon/llcoros.h

indra/llcommon/llstring.cpp

indra/llcommon/llstring.h

indra/llcommon/lluri.cpp

indra/llcommon/tests/lleventcoro_test.cpp

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/lltextbase.cpp

indra/llui/lltexteditor.cpp

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp