diff options
| author | Melanie | 2012-10-02 23:02:53 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-02 23:02:53 +0100 |
| commit | ca5c0814f4c6e286e24e1971620aec3c0ee1c2d3 (patch) | |
| tree | f630648180aca5a498cb674bfb1f967eb9bcb260 /CONTRIBUTORS.txt | |
| parent | Attempt to fix Mantis #6311. Honor a destination folder if one is given (diff) | |
| parent | correcting typo (diff) | |
| download | opensim-SC_OLD-ca5c0814f4c6e286e24e1971620aec3c0ee1c2d3.zip opensim-SC_OLD-ca5c0814f4c6e286e24e1971620aec3c0ee1c2d3.tar.gz opensim-SC_OLD-ca5c0814f4c6e286e24e1971620aec3c0ee1c2d3.tar.bz2 opensim-SC_OLD-ca5c0814f4c6e286e24e1971620aec3c0ee1c2d3.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
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 a16d174..fd00fe8 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -16,7 +16,7 @@ people that make the day to day of OpenSim happen. | |||
| 16 | * BlueWall (James Hughes) | 16 | * BlueWall (James Hughes) |
| 17 | * Nebadon Izumi (Michael Cerquoni, OSgrid) | 17 | * Nebadon Izumi (Michael Cerquoni, OSgrid) |
| 18 | * Snoopy Pfeffer | 18 | * Snoopy Pfeffer |
| 19 | * Richard Adams (Intel) | 19 | * Robert Adams (Intel) |
| 20 | 20 | ||
| 21 | = Core Developers Following the White Rabbit = | 21 | = Core Developers Following the White Rabbit = |
| 22 | 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. |