Melanie fd22159d0c Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Framework/Watchdog.cs

2011-10-26 01:27:24 +01:00

..

HttpServer

Merge branch 'master' into bigmerge

2011-10-26 01:27:24 +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 bigmerge

2011-10-26 01:27:24 +01: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