merge

.hgtags

autobuild.xml

doc/contributions.txt

indra/llcommon/llmemory.cpp

indra/llcommon/llmemory.h

indra/llcommon/llversionviewer.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llui/lldockablefloater.cpp

indra/llui/llkeywords.h

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h

indra/llui/lltoolbar.cpp

indra/llui/lltoolbar.h

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowwin32.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_per_account.xml