diff options
| author | Melanie | 2012-08-15 18:58:15 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-15 18:58:15 +0100 |
| commit | 90e4c3fece3cdd5829655f6d5f45208b19244377 (patch) | |
| tree | b8ac9ea9a7e68d139985ae5965af85ac1ac368b0 /.nant/local.include | |
| parent | Let the temp attachment module add a command to allow attaching without permi... (diff) | |
| parent | Add a skeleton for a name value storage associated with regions (diff) | |
| download | opensim-SC-90e4c3fece3cdd5829655f6d5f45208b19244377.zip opensim-SC-90e4c3fece3cdd5829655f6d5f45208b19244377.tar.gz opensim-SC-90e4c3fece3cdd5829655f6d5f45208b19244377.tar.bz2 opensim-SC-90e4c3fece3cdd5829655f6d5f45208b19244377.tar.xz | |
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 '')
0 files changed, 0 insertions, 0 deletions