Merge.

.hgtags

BuildParams

autobuild.xml

indra/cmake/Pth.cmake

indra/llcommon/CMakeLists.txt

indra/llcommon/llsys.cpp

indra/llcommon/llversionviewer.h

indra/llmessage/llcurl.cpp

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowmacosx.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_minimal.xml

indra/newview/licenses-mac.txt

indra/newview/llagent.cpp

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchiclet.cpp

indra/newview/llfloatersidetraytab.cpp

indra/newview/llfloatersounddevices.cpp