Melanie 84377a23db Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs

2012-06-11 16:56:40 +01:00

126 KiB

Raw Blame History

View Raw