diff options
| author | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
| commit | 3f703ae1cb02cbcb0efaff061d495bacca941de0 (patch) | |
| tree | 3221068b4bc4119023b3dfa621c19e126c2eb3f3 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into 0.8-post-fixes (diff) | |
| parent | minor: Comment out 2 error level debugging message in authentication code (diff) | |
| download | opensim-SC-3f703ae1cb02cbcb0efaff061d495bacca941de0.zip opensim-SC-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.gz opensim-SC-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.bz2 opensim-SC-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.xz | |
Merge branch 'master' into 0.8-post-fixes
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index f378925..1d080ff 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -127,12 +127,14 @@ what it is today. | |||
| 127 | * maimedleech | 127 | * maimedleech |
| 128 | * Mana Janus | 128 | * Mana Janus |
| 129 | * MarcelEdward | 129 | * MarcelEdward |
| 130 | * Matt Lehmann | ||
| 130 | * Mic Bowman | 131 | * Mic Bowman |
| 131 | * Michelle Argus | 132 | * Michelle Argus |
| 132 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) | 133 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) |
| 133 | * Micheil Merlin | 134 | * Micheil Merlin |
| 134 | * Mike Osias (IBM) | 135 | * Mike Osias (IBM) |
| 135 | * Mike Pitman (IBM) | 136 | * Mike Pitman (IBM) |
| 137 | * mikemig | ||
| 136 | * mikkopa/_someone - RealXtend | 138 | * mikkopa/_someone - RealXtend |
| 137 | * Misterblue | 139 | * Misterblue |
| 138 | * Mircea Kitsune | 140 | * Mircea Kitsune |