merge

indra/llcommon/lleventdispatcher.h

indra/llui/llflatlistview.cpp

indra/llui/llflatlistview.h

indra/llui/llfloater.cpp

indra/llui/llnotificationslistener.cpp

indra/newview/CMakeLists.txt

indra/newview/gpu_table.txt

indra/newview/llbottomtray.cpp

indra/newview/llimview.cpp

indra/newview/llimview.h

indra/newview/llpanelimcontrolpanel.cpp

indra/newview/llpanelimcontrolpanel.h

indra/newview/llpanelpeople.cpp

indra/newview/llpanelteleporthistory.cpp

indra/newview/llsyswellwindow.cpp

indra/newview/llworldmapview.cpp

indra/newview/skins/default/xui/en/floater_incoming_call.xml

indra/newview/skins/default/xui/en/floater_outgoing_call.xml

indra/newview/skins/default/xui/en/strings.xml