MErge

.hgtags

doc/contributions.txt

indra/cmake/BuildVersion.cmake

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llmath/llvolumeoctree.cpp

indra/llmath/llvolumeoctree.h

indra/llrender/llshadermgr.cpp

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

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

...pp_settings/shaders/class1/deferred/alphaNonIndexedF.glsl

...ew/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl

...a/newview/app_settings/shaders/class1/deferred/bumpV.glsl

...iew/app_settings/shaders/class1/deferred/fullbrightF.glsl

...pp_settings/shaders/class1/deferred/fullbrightShinyF.glsl

...wview/app_settings/shaders/class1/deferred/materialF.glsl

...wview/app_settings/shaders/class1/deferred/materialV.glsl

...pp_settings/shaders/class1/lighting/lightFullbrightF.glsl

.../class1/lighting/lightFullbrightNonIndexedAlphaMaskF.glsl