merge

.hgtags

doc/contributions.txt

indra/llcommon/llmemory.cpp

indra/llcommon/llmemory.h

indra/llcommon/lluriparser.cpp

indra/llimage/llimagebmp.cpp

indra/llimage/llimagetga.cpp

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/llprimitive.h

indra/llprimitive/llprimtexturelist.cpp

indra/llprimitive/llprimtexturelist.h

indra/llprimitive/lltextureentry.cpp

indra/llprimitive/lltextureentry.h

indra/llui/lldockablefloater.cpp

indra/llui/llfolderviewitem.cpp

indra/llui/llfolderviewitem.h