merge

.hgignore

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llfloater.cpp

indra/llui/llflyoutbutton.cpp

indra/llui/llmenugl.cpp

indra/llui/lltabcontainer.cpp

indra/llui/lltextbase.cpp

indra/newview/llchiclet.cpp

indra/newview/lldebugmessagebox.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llhudview.cpp

indra/newview/llhudview.h

indra/newview/llviewermenu.cpp

...ewview/skins/default/xui/en/floater_animation_preview.xml

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

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

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

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

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