merge

doc/contributions.txt

indra/llmath/llmath.h

indra/llprimitive/llmodel.cpp

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llvertexbuffer.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

.../newview/app_settings/shaders/class1/deferred/alphaF.glsl

...view/app_settings/shaders/class1/deferred/blurLightF.glsl

...w/app_settings/shaders/class1/deferred/postDeferredF.glsl

...w/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl

.../newview/app_settings/shaders/class2/deferred/alphaF.glsl

...view/app_settings/shaders/class2/deferred/blurLightF.glsl

...view/app_settings/shaders/class2/deferred/blurLightV.glsl

...w/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl

indra/newview/lldebugview.cpp

indra/newview/llfasttimerview.cpp

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloatermodelpreview.h