Melanie 62d0a0cdbf Remove harmless merge artefact		2011-12-06 22:58:00 +01:00
..
ApplicationPlugins	Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.	2011-12-05 20:44:20 +00:00
Capabilities	Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously."	2011-12-06 18:37:13 +00:00
ConsoleClient	Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.	2011-10-25 20:24:21 +01:00
Data	Merge branch 'master' into bigmerge	2011-12-05 17:10:51 +00:00
Framework	Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.	2011-12-05 20:44:20 +00:00
Region	Remove harmless merge artefact	2011-12-06 22:58:00 +01:00
Server	Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.	2011-12-05 20:44:20 +00:00
Services	Merge branch 'master' into bigmerge	2011-12-05 17:10:51 +00:00
Tests	Merge branch 'master' into bigmerge	2011-12-06 19:01:05 +00:00
Tools	Adding missing CrossBehaviour.cs file to fix build	2011-11-24 22:46:43 +00:00