Merge

.hgtags

build.sh

indra/llui/llaccordionctrltab.cpp

indra/llui/llbutton.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llnotifications.cpp

indra/llui/llnotifications.h

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_solaris.txt

indra/newview/featuretable_xp.txt

indra/newview/llbottomtray.cpp

indra/newview/llfloaterhardwaresettings.cpp

indra/newview/llfloaterland.cpp

indra/newview/llfloatermap.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llnamebox.cpp