merge

autobuild.xml

indra/cmake/DirectX.cmake

indra/llcommon/llfile.cpp

indra/llcommon/llfile.h

indra/llmessage/tests/llhttpclient_test.cpp

indra/llmessage/tests/test_llsdmessage_peer.py

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llimagegl.cpp

indra/llwindow/llwindow.cpp

indra/llwindow/llwindow.h

indra/llwindow/llwindowheadless.cpp

indra/llwindow/llwindowheadless.h

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowmacosx.h

indra/llwindow/llwindowmesaheadless.cpp

indra/llwindow/llwindowmesaheadless.h

indra/llwindow/llwindowsdl.cpp

indra/llwindow/llwindowsdl.h

indra/llwindow/llwindowwin32.cpp