diff options
| author | Melanie | 2012-04-14 01:51:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-14 01:51:20 +0100 |
| commit | 919972a440acae2e3324cfe178ff249986855055 (patch) | |
| tree | 82054de2b261d4f7f49f4eced021aa731b9b21aa /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-919972a440acae2e3324cfe178ff249986855055.zip opensim-SC-919972a440acae2e3324cfe178ff249986855055.tar.gz opensim-SC-919972a440acae2e3324cfe178ff249986855055.tar.bz2 opensim-SC-919972a440acae2e3324cfe178ff249986855055.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.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 287073b..1370449 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -144,6 +144,7 @@ what it is today. | |||
| 144 | * SignpostMarv | 144 | * SignpostMarv |
| 145 | * SpotOn3D | 145 | * SpotOn3D |
| 146 | * Strawberry Fride | 146 | * Strawberry Fride |
| 147 | * Talun | ||
| 147 | * tglion | 148 | * tglion |
| 148 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 149 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |
| 149 | * tyre | 150 | * tyre |