Fixed: Merge.

README.md

autobuild.xml

build.sh

indra/llappearance/llwearabletype.cpp

indra/llcommon/llerrorthread.cpp

indra/llcommon/lleventtimer.cpp

indra/llimage/llimagefilter.cpp

indra/llimage/llimagejpeg.cpp

indra/llinventory/llsettingssky.cpp

indra/llmath/llmath.h

indra/llmath/llvector4a.h

indra/llrender/llatmosphere.cpp

indra/llrender/llgl.cpp

indra/llrender/llimagegl.cpp

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/llui/llconsole.cpp

indra/llui/lllayoutstack.cpp

indra/newview/CMakeLists.txt

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