merge

.hgtags

doc/contributions.txt

indra/llcommon/llcoros.cpp

indra/llcommon/llcoros.h

indra/llimage/llimage.cpp

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llprimitive/lldaeloader.cpp

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/llui/llbutton.cpp

indra/llui/llfloater.cpp

indra/newview/VIEWER_VERSION.txt

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llcommandhandler.cpp

indra/newview/llconversationlog.cpp

indra/newview/lldrawpoolavatar.cpp