diff options
author | teravus | 2012-11-15 10:05:16 -0500 |
---|---|---|
committer | teravus | 2012-11-15 10:05:16 -0500 |
commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /CONTRIBUTORS.txt | |
parent | Merge master into teravuswork (diff) | |
download | opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to '')
-rw-r--r-- | CONTRIBUTORS.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e5a6d49..9dd0797 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -1,5 +1,5 @@ | |||
1 | <<<>>>>The following people have contributed to OpenSim (Thank you | 1 | <<<>>>>The following people have contributed to OpenSim (Thank you |
2 | for your effort!) | 2 | for your effort!) |
3 | 3 | ||
4 | = Current OpenSim Developers (in very rough order of appearance) = | 4 | = Current OpenSim Developers (in very rough order of appearance) = |
5 | These folks represent the current core team for OpenSim, and are the | 5 | These folks represent the current core team for OpenSim, and are the |
@@ -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 | * Robert Adams (Intel) | 19 | * Richard 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. |
@@ -92,7 +92,6 @@ what it is today. | |||
92 | * Flyte Xevious | 92 | * Flyte Xevious |
93 | * Garmin Kawaguichi | 93 | * Garmin Kawaguichi |
94 | * Gryc Ueusp | 94 | * Gryc Ueusp |
95 | * Hiro Lecker | ||
96 | * Imaze Rhiano | 95 | * Imaze Rhiano |
97 | * Intimidated | 96 | * Intimidated |
98 | * Jeremy Bongio (IBM) | 97 | * Jeremy Bongio (IBM) |
@@ -182,14 +181,12 @@ what it is today. | |||
182 | 181 | ||
183 | This software uses components from the following developers: | 182 | This software uses components from the following developers: |
184 | * Sleepycat Software (Berkeley DB) | 183 | * Sleepycat Software (Berkeley DB) |
185 | * Aurora-Sim (http://aurora-sim.org) | ||
186 | * SQLite (Public Domain) | 184 | * SQLite (Public Domain) |
187 | * XmlRpcCS (http://xmlrpccs.sf.net/) | 185 | * XmlRpcCS (http://xmlrpccs.sf.net/) |
188 | * MySQL, Inc. (MySQL Connector/NET) | 186 | * MySQL, Inc. (MySQL Connector/NET) |
189 | * NUnit (http://www.nunit.org) | 187 | * NUnit (http://www.nunit.org) |
190 | * AGEIA Inc. (PhysX) | 188 | * AGEIA Inc. (PhysX) |
191 | * Russel L. Smith (ODE) | 189 | * Russel L. Smith (ODE) |
192 | * Erwin Coumans (Bullet) | ||
193 | * Prebuild (http://sourceforge.net/projects/dnpb/) | 190 | * Prebuild (http://sourceforge.net/projects/dnpb/) |
194 | * LibOpenMetaverse (http://lib.openmetaverse.org/) | 191 | * LibOpenMetaverse (http://lib.openmetaverse.org/) |
195 | * DotNetOpenMail v0.5.8b (http://dotnetopenmail.sourceforge.net) | 192 | * DotNetOpenMail v0.5.8b (http://dotnetopenmail.sourceforge.net) |
@@ -211,4 +208,3 @@ In addition, we would like to thank: | |||
211 | * The NANT Developers | 208 | * The NANT Developers |
212 | * Microsoft (.NET, MSSQL-Adapters) | 209 | * Microsoft (.NET, MSSQL-Adapters) |
213 | *x | 210 | *x |
214 | |||