merge

.hgtags

BuildParams

indra/llcommon/llversionviewer.h

indra/llmath/lloctree.h

indra/llui/lldockablefloater.cpp

indra/llui/lldockablefloater.h

indra/llui/lldockcontrol.cpp

indra/llui/lldockcontrol.h

indra/llui/llfloater.cpp

indra/llui/lltoolbar.cpp

indra/llui/lltoolbar.h

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_per_account.xml

indra/newview/installers/darwin/dmg-cleanup.applescript

...ewview/installers/darwin/fix_application_icon_position.sh

indra/newview/installers/darwin/release-dmg/_DS_Store

indra/newview/installers/windows/installer_template.nsi

indra/newview/llfavoritesbar.cpp

indra/newview/llfavoritesbar.h

indra/newview/llfloatertoybox.cpp