Melanie 727ddffb71 Merge branch 'master' into careminster		2012-01-31 21:53:32 +00:00
..
HttpServer	Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge	2011-12-08 03:24:25 +00:00
Tests	Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.	2011-03-09 23:25:24 +00:00
BaseOpenSimServer.cs	Merge branch 'master' into careminster	2012-01-31 21:53:32 +00:00
MainServer.cs	Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.	2011-10-25 20:24:21 +01:00
VersionInfo.cs	Adjust CM version tag	2011-10-12 07:08:23 +01:00