merge

.hgtags

autobuild.xml

doc/contributions.txt

indra/llappearance/llavatarappearance.cpp

indra/llappearance/llavatarappearance.h

indra/llappearance/llpolyskeletaldistortion.cpp

indra/llcharacter/lljoint.cpp

indra/llcharacter/lljoint.h

indra/llimage/llimagefilter.cpp

indra/llmath/llquaternion.h

indra/llprimitive/llmodel.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llrender.cpp

indra/llrender/llvertexbuffer.cpp

indra/llui/llfolderviewitem.cpp

indra/llui/llfolderviewmodel.h

indra/llui/llkeywords.cpp

indra/llui/llmenugl.cpp

indra/llui/llstatbar.cpp

indra/llui/llurlentry.cpp