merge

.hgtags

BuildParams

doc/contributions.txt

indra/cmake/BuildVersion.cmake

indra/cmake/LLAddBuildTest.cmake

indra/lib/python/indra/util/llmanifest.py

indra/llcommon/tests/llprocess_test.cpp

indra/llimage/llimage.cpp

indra/llimage/llimage.h

indra/llmath/llcamera.cpp

indra/llmath/llcamera.h

indra/llmessage/llcurl.cpp

indra/llprimitive/llmodel.cpp

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llimagegl.cpp

indra/llrender/llrendertarget.cpp

indra/llui/llfloaterreg.cpp

indra/llui/llnotifications.cpp

indra/llui/llscrolllistcolumn.cpp