Andros Baphomet
fe0a761ce6
Merge remote-tracking branch 'upstream/master'
Conflicts:
indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
indra/newview/app_settings/shaders/class1/deferred/giF.glsl
indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl
indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl