merging

indra/llaudio/llaudioengine.cpp

indra/llaudio/llaudioengine.h

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llui/llui.cpp

indra/llui/llui.h

indra/llvfs/lldir.cpp

indra/llvfs/lldir.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llautoreplace.cpp

indra/newview/llautoreplace.h

indra/newview/llavataractions.cpp

indra/newview/llconversationlog.cpp

indra/newview/llconversationlog.h

indra/newview/llconversationmodel.cpp

indra/newview/llconversationmodel.h