merge

.hgtags

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/llavatariconctrl.cpp

indra/newview/llchannelmanager.cpp

indra/newview/llchiclet.cpp

indra/newview/llchicletbar.cpp

indra/newview/llfloaternotificationstabbed.cpp

indra/newview/llfloaternotificationstabbed.h

indra/newview/llnotificationlistitem.cpp

indra/newview/llnotificationlistitem.h

indra/newview/llnotificationlistview.cpp

indra/newview/llnotificationlistview.h

indra/newview/llsyswellwindow.cpp

indra/newview/llsyswellwindow.h

indra/newview/lltoastgroupnotifypanel.cpp

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewermessage.cpp

indra/newview/skins/default/colors.xml

...ew/skins/default/textures/icons/Icon_Attachment_Large.png