Melanie 34f20b7fe3 Merge branch 'master' into careminster		2012-05-17 13:28:25 +01:00
..
ApplicationPlugins	Merge branch 'master' into careminster	2012-05-10 20:33:27 +01:00
Capabilities	Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.	2012-05-03 01:45:49 +01: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 'avination' into careminster	2012-05-15 21:24:27 +01:00
Framework	Merge branch 'master' into careminster	2012-05-14 23:32:49 +01:00
Region	Merge branch 'master' into careminster	2012-05-17 13:28:25 +01:00
Server	Merge branch 'master' into careminster	2012-05-10 00:42:10 +01:00
Services	Merge branch 'master' into careminster	2012-05-10 00:42:10 +01:00
Tests	Merge branch 'master' into careminster	2012-05-17 13:28:25 +01:00
Tools	Print out more information on connecting bots	2012-05-11 02:38:29 +01:00