diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /CONTRIBUTORS.txt | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
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 5c1bdf1..2fe8b46 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. |
| @@ -112,6 +113,7 @@ what it is today. | |||
| 112 | * mpallari | 113 | * mpallari |
| 113 | * MrMonkE | 114 | * MrMonkE |
| 114 | * Nebadon Izumi (Michael Cerquoni - http://OSgrid.org) | 115 | * Nebadon Izumi (Michael Cerquoni - http://OSgrid.org) |
| 116 | * Neil Canham | ||
| 115 | * nornalbion | 117 | * nornalbion |
| 116 | * Omar Vera Ustariz (IBM) | 118 | * Omar Vera Ustariz (IBM) |
| 117 | * openlifegrid.com | 119 | * openlifegrid.com |
| @@ -128,7 +130,6 @@ what it is today. | |||
| 128 | * Salahzar Stenvaag | 130 | * Salahzar Stenvaag |
| 129 | * sempuki | 131 | * sempuki |
| 130 | * SignpostMarv | 132 | * SignpostMarv |
| 131 | * Snoopy | ||
| 132 | * Strawberry Fride | 133 | * Strawberry Fride |
| 133 | * tglion | 134 | * tglion |
| 134 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 135 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |