# Conflicts: # indra/llkdu/llimagej2ckdu.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/lleventpoll.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.h