Merge

.hgtags

doc/contributions.txt

indra/llmath/llvolume.cpp

indra/llprimitive/llmaterial.cpp

indra/llprimitive/llmaterial.h

indra/llprimitive/lltextureentry.h

indra/llrender/llgl.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llshadermgr.cpp

indra/llui/lltooltip.cpp

indra/llui/llui.cpp

indra/llwindow/llopenglview-objc.mm

indra/llwindow/llwindowcallbacks.cpp

indra/llwindow/llwindowcallbacks.h

indra/llwindow/llwindowmacosx-objc.h

indra/llwindow/llwindowmacosx-objc.mm

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowmacosx.h

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml