merge

.hgtags

autobuild.xml

doc/contributions.txt

indra/llkdu/tests/llimagej2ckdu_test.cpp

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llprimitive/llmaterialid.cpp

indra/llprimitive/llmaterialid.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/llprimitive.h

indra/llrender/CMakeLists.txt

indra/llrender/llgl.h

indra/llrender/llglcommonfunc.cpp

indra/llrender/llglcommonfunc.h

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/llxml/llcontrol.h

indra/newview/CMakeLists.txt