Melanie e8cd9fbbb7 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs		2012-06-07 23:33:40 +01:00
..
HttpServer	Merge branch 'master' into careminster	2012-06-07 23:33:40 +01: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-03-18 20:44:56 +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	Merge branch 'master' into careminster	2012-03-31 02:18:02 +01:00