diff options
| author | Justin Clark-Casey (justincc) | 2014-03-21 23:18:13 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-21 23:18:13 +0000 |
| commit | 6664079f8474638d1980a9319e81eb19c3537a2f (patch) | |
| tree | 3e7dbbf971f0144be1373582e2debf036842ff64 | |
| parent | Mantis 6922: No particles are generated if their size exceeds the maximum all... (diff) | |
| parent | Moved Oren Hurvitz to core developers list (diff) | |
| download | opensim-SC-6664079f8474638d1980a9319e81eb19c3537a2f.zip opensim-SC-6664079f8474638d1980a9319e81eb19c3537a2f.tar.gz opensim-SC-6664079f8474638d1980a9319e81eb19c3537a2f.tar.bz2 opensim-SC-6664079f8474638d1980a9319e81eb19c3537a2f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e0b7471..0d96ed6 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -16,6 +16,7 @@ people that make the day to day of OpenSim happen. | |||
| 16 | * Nebadon Izumi (Michael Cerquoni, OSgrid) | 16 | * Nebadon Izumi (Michael Cerquoni, OSgrid) |
| 17 | * Snoopy Pfeffer | 17 | * Snoopy Pfeffer |
| 18 | * Robert Adams (Intel) | 18 | * Robert Adams (Intel) |
| 19 | * Oren Hurvitz (Kitely) | ||
| 19 | 20 | ||
| 20 | = Core Developers Following the White Rabbit = | 21 | = Core Developers Following the White Rabbit = |
| 21 | Core developers who have temporarily (we hope) gone chasing the white rabbit. | 22 | Core developers who have temporarily (we hope) gone chasing the white rabbit. |
| @@ -139,7 +140,6 @@ what it is today. | |||
| 139 | * nornalbion | 140 | * nornalbion |
| 140 | * Omar Vera Ustariz (IBM) | 141 | * Omar Vera Ustariz (IBM) |
| 141 | * openlifegrid.com | 142 | * openlifegrid.com |
| 142 | * Oren Hurvitz (Kitely) | ||
| 143 | * otakup0pe | 143 | * otakup0pe |
| 144 | * Pixel Tomsen | 144 | * Pixel Tomsen |
| 145 | * ralphos | 145 | * ralphos |