diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MSSQL/MSSQLSimulationData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/Null/NullSimulationData.cs
OpenSim/Data/SQLite/SQLiteSimulationData.cs
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
0 files changed, 0 insertions, 0 deletions