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

..

Properties

Deleted all AssemblyFileVersion directives

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

Resources

Thanks, zaki, for a patch that embeds plugin manifest files into plugin dlls. Fix issue 1876.

2008-08-06 01:20:31 +00:00

RemoteAdminPlugin.cs

Merge branch 'master' into careminster

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