diff options
| author | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
| commit | 091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch) | |
| tree | a98354e9317e0ed6892dec344a69447c0e9c70b8 /CONTRIBUTORS.txt | |
| parent | Don't fail to enable permissions modules correctly if there is any leading or... (diff) | |
| parent | Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "de... (diff) | |
| download | opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2 opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz | |
Merge branch 'master' of ssh://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 0d96ed6..f6071f2 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -17,6 +17,7 @@ people that make the day to day of OpenSim happen. | |||
| 17 | * Snoopy Pfeffer | 17 | * Snoopy Pfeffer |
| 18 | * Robert Adams (Intel) | 18 | * Robert Adams (Intel) |
| 19 | * Oren Hurvitz (Kitely) | 19 | * Oren Hurvitz (Kitely) |
| 20 | * Kevin Cozens | ||
| 20 | 21 | ||
| 21 | = Core Developers Following the White Rabbit = | 22 | = Core Developers Following the White Rabbit = |
| 22 | Core developers who have temporarily (we hope) gone chasing the white rabbit. | 23 | Core developers who have temporarily (we hope) gone chasing the white rabbit. |
| @@ -111,7 +112,6 @@ what it is today. | |||
| 111 | * Jon Cundill | 112 | * Jon Cundill |
| 112 | * Junta Kohime | 113 | * Junta Kohime |
| 113 | * Kayne | 114 | * Kayne |
| 114 | * Kevin Cozens | ||
| 115 | * kinoc (Daxtron Labs) | 115 | * kinoc (Daxtron Labs) |
| 116 | * Kira | 116 | * Kira |
| 117 | * Kitto Flora | 117 | * Kitto Flora |