diff options
| author | Melanie | 2012-05-27 19:24:30 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-27 19:24:30 +0100 |
| commit | 884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f (patch) | |
| tree | dd692a54213f86fd64bd29c6662584df85088193 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: code formatting from 0b72f773 (diff) | |
| download | opensim-SC-884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f.zip opensim-SC-884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f.tar.gz opensim-SC-884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f.tar.bz2 opensim-SC-884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to '')
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e1de751..b1c3452 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -146,6 +146,7 @@ what it is today. | |||
| 146 | * Stefan_Boom / stoehr | 146 | * Stefan_Boom / stoehr |
| 147 | * Strawberry Fride | 147 | * Strawberry Fride |
| 148 | * Talun | 148 | * Talun |
| 149 | * TechplexEngineer (Blake Bourque) | ||
| 149 | * TBG Renfold | 150 | * TBG Renfold |
| 150 | * tglion | 151 | * tglion |
| 151 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 152 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |