diff options
| author | Diva Canto | 2015-09-05 10:29:18 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-09-05 10:29:18 -0700 |
| commit | bba79424b6f44d5cc0563f1ffdd438d1654708f7 (patch) | |
| tree | 415036fda1b2db6a6aa7c0a81cb0f2999040f64c | |
| parent | Changed a couple of comments to be more generic (diff) | |
| parent | Best wishes everyone! (diff) | |
| download | opensim-SC_OLD-bba79424b6f44d5cc0563f1ffdd438d1654708f7.zip opensim-SC_OLD-bba79424b6f44d5cc0563f1ffdd438d1654708f7.tar.gz opensim-SC_OLD-bba79424b6f44d5cc0563f1ffdd438d1654708f7.tar.bz2 opensim-SC_OLD-bba79424b6f44d5cc0563f1ffdd438d1654708f7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e14e5ef..41c22b8 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -4,8 +4,7 @@ The following people have contributed to OpenSim (Thank you for your effort!) | |||
| 4 | These folks represent the current core team for OpenSim, and are the | 4 | These folks represent the current core team for OpenSim, and are the |
| 5 | people that make the day to day of OpenSim happen. | 5 | people that make the day to day of OpenSim happen. |
| 6 | 6 | ||
| 7 | * justincc (OSVW Consulting, justincc.org) | 7 | * justincc (OSVW Consulting, justincc.org) |
| 8 | * dahlia | ||
| 9 | * Melanie Thielker | 8 | * Melanie Thielker |
| 10 | * Diva (Crista Lopes, University of California, Irvine) | 9 | * Diva (Crista Lopes, University of California, Irvine) |
| 11 | * BlueWall (James Hughes) | 10 | * BlueWall (James Hughes) |
| @@ -56,6 +55,7 @@ where we are today. | |||
| 56 | * nlin (3Di) | 55 | * nlin (3Di) |
| 57 | * John Hurliman | 56 | * John Hurliman |
| 58 | * chi11ken (Genkii) | 57 | * chi11ken (Genkii) |
| 58 | * dahlia | ||
| 59 | 59 | ||
| 60 | 60 | ||
| 61 | = Additional OpenSim Contributors = | 61 | = Additional OpenSim Contributors = |