merge

.hgignore

autobuild.xml

indra/cmake/DirectX.cmake

indra/cmake/LLRender.cmake

indra/cmake/LLWindow.cmake

indra/llmessage/tests/llhttpclient_test.cpp

indra/llmessage/tests/test_llsdmessage_peer.py

indra/llrender/CMakeLists.txt

indra/llrender/llfontregistry.cpp

indra/llrender/llrender.cpp

indra/llrender/llrendertarget.cpp

indra/llrender/llrendertarget.h

indra/llrender/llvertexbuffer.cpp

indra/llwindow/CMakeLists.txt

indra/llwindow/llwindow.cpp

indra/llwindow/llwindowmesaheadless.h

indra/lscript/lscript_compile/CMakeLists.txt

indra/lscript/lscript_compile/bison.bat

indra/lscript/lscript_compile/indra.l

indra/newview/lldirpicker.cpp