merge

.hgtags

BuildParams

doc/contributions.txt

indra/integration_tests/CMakeLists.txt

indra/integration_tests/llimage_libtest/CMakeLists.txt

indra/integration_tests/llimage_libtest/llimage_libtest.cpp

indra/integration_tests/llimage_libtest/llimage_libtest.h

indra/llcommon/llmetricperformancetester.cpp

indra/llcommon/llmetricperformancetester.h

indra/llcommon/llprocesslauncher.cpp

indra/llcommon/llsdserialize.cpp

indra/llcommon/llversionviewer.h

indra/llimage/llimage.h

indra/llimage/llimagej2c.cpp

indra/llmath/llmath.h

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llmath/m4math.cpp

indra/llmath/m4math.h

indra/llprimitive/llmodel.cpp