diff options
| author | Melanie | 2011-11-05 11:17:40 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-05 11:17:40 +0000 |
| commit | 03f5bbcaf2a58990b59d573cdde671ae803e2224 (patch) | |
| tree | caa6bad1f5f66f7933be6f6f36013e26fba7a100 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | add myself to the contributors.txt (diff) | |
| download | opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.zip opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.gz opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.bz2 opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 2620a20..7a25d3f 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 | * Nebadon Izumi (Michael Cerquoni, OSgrid) | ||
| 17 | * Snoopy Pfeffer | 18 | * Snoopy Pfeffer |
| 18 | * Richard Adams (Intel) | 19 | * Richard Adams (Intel) |
| 19 | 20 | ||
| @@ -102,6 +103,7 @@ what it is today. | |||
| 102 | * lulurun | 103 | * lulurun |
| 103 | * M.Igarashi | 104 | * M.Igarashi |
| 104 | * maimedleech | 105 | * maimedleech |
| 106 | * Mana Janus | ||
| 105 | * Mic Bowman | 107 | * Mic Bowman |
| 106 | * Michelle Argus | 108 | * Michelle Argus |
| 107 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) | 109 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) |
| @@ -133,6 +135,7 @@ what it is today. | |||
| 133 | * Salahzar Stenvaag | 135 | * Salahzar Stenvaag |
| 134 | * sempuki | 136 | * sempuki |
| 135 | * SignpostMarv | 137 | * SignpostMarv |
| 138 | * SpotOn3D | ||
| 136 | * Strawberry Fride | 139 | * Strawberry Fride |
| 137 | * tglion | 140 | * tglion |
| 138 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 141 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |