diff options
| author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
|---|---|---|
| committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
| commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
| tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /CONTRIBUTORS.txt | |
| parent | Merge git://opensimulator.org/git/opensim (diff) | |
| parent | minor: remove mono compiler warnings (diff) | |
| download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz | |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | CONTRIBUTORS.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 38343a4..ef00c19 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -28,7 +28,7 @@ people that make the day to day of OpenSim happen. | |||
| 28 | * Diva (Crista Lopes, University of California, Irvine) | 28 | * Diva (Crista Lopes, University of California, Irvine) |
| 29 | * nlin (3Di) | 29 | * nlin (3Di) |
| 30 | * Arthur Rodrigo S Valadares (IBM) | 30 | * Arthur Rodrigo S Valadares (IBM) |
| 31 | 31 | * BlueWall (James Hughes) | |
| 32 | 32 | ||
| 33 | = Past Open Sim Developers = | 33 | = Past Open Sim Developers = |
| 34 | These folks are alumns of the OpenSim core group, but are now | 34 | These folks are alumns of the OpenSim core group, but are now |
| @@ -117,6 +117,7 @@ what it is today. | |||
| 117 | * SachaMagne | 117 | * SachaMagne |
| 118 | * Salahzar Stenvaag | 118 | * Salahzar Stenvaag |
| 119 | * sempuki | 119 | * sempuki |
| 120 | * SignpostMarv | ||
| 120 | * Snoopy | 121 | * Snoopy |
| 121 | * Strawberry Fride | 122 | * Strawberry Fride |
| 122 | * tglion | 123 | * tglion |