Melanie dfafb5ca14 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs		2012-06-12 03:09:52 +01:00
..
ApplicationPlugins	…
Capabilities	…
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	…
Framework	Merge branch 'master' into careminster	2012-06-12 03:09:52 +01:00
Region	Merge branch 'master' into careminster	2012-06-12 03:09:52 +01:00
Server	…
Services	Merge branch 'master' into careminster	2012-06-12 03:09:52 +01:00
Tests	…
Tools	…