OpenSimMirror/OpenSim/ApplicationPlugins
Melanie 71dd55a1ce Merge branch 'master' into careminster
Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-09-29 19:21:07 +01:00
..
LoadRegions
RegionModulesController
RemoteController Merge branch 'master' into careminster 2012-09-29 19:21:07 +01:00
Rest Comment out the long unused afaik HTTP agent handlers. 2012-09-21 00:29:13 +01:00