merge

autobuild.xml

build.sh

doc/contributions.txt

indra/cmake/run_build_test.py

indra/llcommon/CMakeLists.txt

indra/llcommon/llaccountingquota.h

indra/llcommon/llversionviewer.h

indra/llinventory/llparcel.cpp

indra/llinventory/llparcel.h

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llrender.cpp

indra/llrender/llrendertarget.cpp

indra/llui/llnotifications.cpp

indra/llvfs/lldiriterator.cpp

indra/llxuixml/lltrans.cpp

indra/llxuixml/lltrans.h

indra/newview/CMakeLists.txt

...pp_settings/shaders/class1/deferred/multiPointLightF.glsl

indra/newview/app_settings/windlight/postprocesseffects.xml