Robert Adams 1cf17a3cf7 Merge branch 'master' into varregion ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneBase.cs
	OpenSim/Services/Interfaces/IGridService.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)

2014-01-11 08:52:23 -08:00

..

Properties

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01: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 varregion

2014-01-11 08:52:23 -08:00