diff options
| author | Melanie | 2014-01-28 20:47:36 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-28 20:47:36 +0000 |
| commit | 4ccb15290ea9686070311c8a62c0fd9e6b0787d8 (patch) | |
| tree | 5c4f69879983e87f567e11c59d8d8b83d0bd7bb4 /CONTRIBUTORS.txt | |
| parent | Remove the core module extra profile settings support carried in with the latest (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.zip opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.gz opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.bz2 opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.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 ef84315..9114fc5 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -75,6 +75,7 @@ what it is today. | |||
| 75 | * Chris Yeoh (IBM) | 75 | * Chris Yeoh (IBM) |
| 76 | * controlbreak | 76 | * controlbreak |
| 77 | * coyled | 77 | * coyled |
| 78 | * ctrlaltdavid (David Rowe) | ||
| 78 | * Daedius | 79 | * Daedius |
| 79 | * daTwitch | 80 | * daTwitch |
| 80 | * devalnor-#708 | 81 | * devalnor-#708 |