11fe124ae9
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh. |
||
|---|---|---|
| .. | ||
| commtest.h | ||
| llareslistener_test.cpp | ||
| llavatarnamecache_test.cpp | ||
| llcurl_stub.cpp | ||
| llhost_test.cpp | ||
| llhttpclient_test.cpp | ||
| llhttpclientadapter_test.cpp | ||
| llmime_test.cpp | ||
| llmockhttpclient.h | ||
| llnamevalue_test.cpp | ||
| llpartdata_test.cpp | ||
| llregionpresenceverifier_test.cpp | ||
| llsdmessage_test.cpp | ||
| lltemplatemessagedispatcher_test.cpp | ||
| lltesthttpclientadapter.cpp | ||
| lltesthttpclientadapter.h | ||
| lltestmessagesender.cpp | ||
| lltestmessagesender.h | ||
| lltrustedmessageservice_test.cpp | ||
| llxfer_file_test.cpp | ||
| networkio.h | ||
| test_llsdmessage_peer.py | ||
| testrunner.py | ||