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

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs

2013-08-17 03:23:45 +01:00

..

Agent

Merge branch 'master' into careminster

2013-08-07 23:29:42 +01:00

Asset

Merge branch 'master' into careminster

2013-03-31 20:56:13 +01:00

Avatar

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

Framework

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

Hypergrid

Merge branch 'master' into careminster

2013-08-01 01:23:24 +01:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Scripting

Merge branch 'master' into careminster

2013-08-11 17:31:25 +01:00

ServiceConnectorsIn

UserProfiles

2013-05-30 17:59:18 -04:00

ServiceConnectorsOut

Merge branch 'master' into careminster

2013-08-07 23:29:42 +01:00

World

Merge branch 'master' into careminster

2013-08-11 17:31:25 +01:00