Melanie a022ee5766 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs

2013-06-11 01:03:15 +01:00

..

Interfaces

Update SmartThreadPool to latest version 2.2.3 with a major and minor change.

2013-05-01 19:01:43 +01:00

Shared

Merge branch 'master' into careminster

2013-06-11 01:03:15 +01:00

XEngine

Merge branch 'master' into careminster

2013-05-01 21:39:49 +01:00