diff options
author | Diva Canto | 2012-03-10 08:09:43 -0800 |
---|---|---|
committer | Diva Canto | 2012-03-10 08:09:43 -0800 |
commit | 291dc3969181f4718e84f33e18c4bf9d519cde3d (patch) | |
tree | c22f305a20f32b0a390681ca73eab8cc0bf213b0 /CONTRIBUTORS.txt | |
parent | Serialize all web requests to a particular host:port pair; only applied to th... (diff) | |
parent | Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr... (diff) | |
download | opensim-SC_OLD-291dc3969181f4718e84f33e18c4bf9d519cde3d.zip opensim-SC_OLD-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.gz opensim-SC_OLD-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.bz2 opensim-SC_OLD-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e0a96e7..de5a6fc 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -86,6 +86,7 @@ what it is today. | |||
86 | * Grumly57 | 86 | * Grumly57 |
87 | * GuduleLapointe | 87 | * GuduleLapointe |
88 | * Ewe Loon | 88 | * Ewe Loon |
89 | * Fernando Oliveira | ||
89 | * Fly-Man | 90 | * Fly-Man |
90 | * Flyte Xevious | 91 | * Flyte Xevious |
91 | * Imaze Rhiano | 92 | * Imaze Rhiano |
@@ -135,6 +136,7 @@ what it is today. | |||
135 | * Ruud Lathorp | 136 | * Ruud Lathorp |
136 | * SachaMagne | 137 | * SachaMagne |
137 | * Salahzar Stenvaag | 138 | * Salahzar Stenvaag |
139 | * satguru p srivastava | ||
138 | * sempuki | 140 | * sempuki |
139 | * SignpostMarv | 141 | * SignpostMarv |
140 | * SpotOn3D | 142 | * SpotOn3D |