diff options
| author | Melanie | 2013-11-23 19:13:22 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-23 19:13:22 +0000 |
| commit | 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch) | |
| tree | a833014a1fedd774e7a9a01cd89a7edddb4210ba /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
| download | opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index a4bcb91..ef84315 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -7,7 +7,7 @@ people that make the day to day of OpenSim happen. | |||
| 7 | 7 | ||
| 8 | * justincc (OSVW Consulting, justincc.org) | 8 | * justincc (OSVW Consulting, justincc.org) |
| 9 | * chi11ken (Genkii) | 9 | * chi11ken (Genkii) |
| 10 | * dahlia | 10 | * dahlia |
| 11 | * Melanie Thielker | 11 | * Melanie Thielker |
| 12 | * Diva (Crista Lopes, University of California, Irvine) | 12 | * Diva (Crista Lopes, University of California, Irvine) |
| 13 | * Dan Lake (Intel) | 13 | * Dan Lake (Intel) |
| @@ -109,6 +109,7 @@ what it is today. | |||
| 109 | * Kayne | 109 | * Kayne |
| 110 | * Kevin Cozens | 110 | * Kevin Cozens |
| 111 | * kinoc (Daxtron Labs) | 111 | * kinoc (Daxtron Labs) |
| 112 | * Kira | ||
| 112 | * Kitto Flora | 113 | * Kitto Flora |
| 113 | * KittyLiu | 114 | * KittyLiu |
| 114 | * Kurt Taylor (IBM) | 115 | * Kurt Taylor (IBM) |