Melanie 3589acdab1 Merge branch 'master' into careminster ...

Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat

2013-11-23 19:13:22 +00: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 careminster

2013-11-23 19:13:22 +00:00