merge

.hgtags

BuildParams

autobuild.xml

doc/contributions.txt

indra/integration_tests/llui_libtest/llwidgetreg.cpp

indra/llcharacter/llcharacter.cpp

indra/llcharacter/llcharacter.h

indra/llcharacter/llkeyframemotion.cpp

indra/llcharacter/llkeyframemotion.h

indra/llcommon/llversionviewer.h

indra/llmessage/lliosocket.cpp

indra/llmessage/lliosocket.h

indra/llrender/llgl.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llshadermgr.cpp

indra/llui/CMakeLists.txt

indra/llui/llconsole.cpp

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/llmultislider.cpp