diff options
| author | Mic Bowman | 2011-08-19 14:49:16 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-19 14:49:16 -0700 |
| commit | 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch) | |
| tree | 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /CONTRIBUTORS.txt | |
| parent | BulletSim: add runtime setting of physics parameters. Update default values. (diff) | |
| parent | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff) | |
| download | opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz | |
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 5c1bdf1..b73a87d 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -14,6 +14,7 @@ people that make the day to day of OpenSim happen. | |||
| 14 | * Marck | 14 | * Marck |
| 15 | * Mic Bowman (Intel) | 15 | * Mic Bowman (Intel) |
| 16 | * BlueWall (James Hughes) | 16 | * BlueWall (James Hughes) |
| 17 | * Snoopy Pfeffer | ||
| 17 | 18 | ||
| 18 | = Core Developers Following the White Rabbit = | 19 | = Core Developers Following the White Rabbit = |
| 19 | Core developers who have temporarily (we hope) gone chasing the white rabbit. | 20 | Core developers who have temporarily (we hope) gone chasing the white rabbit. |
| @@ -128,7 +129,6 @@ what it is today. | |||
| 128 | * Salahzar Stenvaag | 129 | * Salahzar Stenvaag |
| 129 | * sempuki | 130 | * sempuki |
| 130 | * SignpostMarv | 131 | * SignpostMarv |
| 131 | * Snoopy | ||
| 132 | * Strawberry Fride | 132 | * Strawberry Fride |
| 133 | * tglion | 133 | * tglion |
| 134 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 134 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |