diff options
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
Diffstat (limited to 'bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config')
0 files changed, 0 insertions, 0 deletions