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 /CONTRIBUTORS.txt | |
| 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 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index b1c3452..9dd0797 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -91,6 +91,7 @@ what it is today. | |||
| 91 | * Fly-Man | 91 | * Fly-Man |
| 92 | * Flyte Xevious | 92 | * Flyte Xevious |
| 93 | * Garmin Kawaguichi | 93 | * Garmin Kawaguichi |
| 94 | * Gryc Ueusp | ||
| 94 | * Imaze Rhiano | 95 | * Imaze Rhiano |
| 95 | * Intimidated | 96 | * Intimidated |
| 96 | * Jeremy Bongio (IBM) | 97 | * Jeremy Bongio (IBM) |