Melanie 50aa89dae6 Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs		2011-12-08 03:24:25 +00:00
..
ApplicationPlugins	Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge	2011-12-08 03:24:25 +00:00
Capabilities	properly lock CapsHandlers.m_capsHandlers	2011-12-07 14:55:01 +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	Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge	2011-12-08 03:24:25 +00:00
Region	Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge	2011-12-08 03:24:25 +00: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