diff options
author | Adam Frisby | 2009-08-16 03:50:12 +1000 |
---|---|---|
committer | Adam Frisby | 2009-08-16 03:50:12 +1000 |
commit | 8b6d79aa3c1ed6630933bafc1122aa78b8268908 (patch) | |
tree | d956a4da2248b42fdb93d90c7b1c57ba8414732d /CONTRIBUTORS.txt | |
parent | * Beginnings of a Security Credential system in MRM. This will eventually lea... (diff) | |
parent | * whoops, missing a / (diff) | |
download | opensim-SC_OLD-8b6d79aa3c1ed6630933bafc1122aa78b8268908.zip opensim-SC_OLD-8b6d79aa3c1ed6630933bafc1122aa78b8268908.tar.gz opensim-SC_OLD-8b6d79aa3c1ed6630933bafc1122aa78b8268908.tar.bz2 opensim-SC_OLD-8b6d79aa3c1ed6630933bafc1122aa78b8268908.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 6aaf6c8..c48ede5 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -77,7 +77,6 @@ what it is today. | |||
77 | * Intimidated | 77 | * Intimidated |
78 | * Jeremy Bongio (IBM) | 78 | * Jeremy Bongio (IBM) |
79 | * jhurliman | 79 | * jhurliman |
80 | * Mike Osias (IBM) | ||
81 | * John R Sohn (XenReborn) | 80 | * John R Sohn (XenReborn) |
82 | * jonc | 81 | * jonc |
83 | * Junta Kohime | 82 | * Junta Kohime |
@@ -91,6 +90,7 @@ what it is today. | |||
91 | * maimedleech | 90 | * maimedleech |
92 | * Mic Bowman | 91 | * Mic Bowman |
93 | * Michelle Argus | 92 | * Michelle Argus |
93 | * Mike Osias (IBM) | ||
94 | * Mike Pitman (IBM) | 94 | * Mike Pitman (IBM) |
95 | * mikkopa/_someone - RealXtend | 95 | * mikkopa/_someone - RealXtend |
96 | * Mircea Kitsune | 96 | * Mircea Kitsune |
@@ -119,9 +119,11 @@ what it is today. | |||
119 | * Xantor | 119 | * Xantor |
120 | * Y. Nitta | 120 | * Y. Nitta |
121 | * YZh | 121 | * YZh |
122 | * Zackary Geers aka Kunnis Basiat | ||
122 | * Zha Ewry | 123 | * Zha Ewry |
123 | 124 | ||
124 | 125 | ||
126 | |||
125 | LSL Devs | 127 | LSL Devs |
126 | 128 | ||
127 | * Alondria | 129 | * Alondria |