diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to '')
| -rw-r--r-- | CONTRIBUTORS.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index fd00fe8..43dea0b 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -93,6 +93,7 @@ what it is today. | |||
| 93 | * Garmin Kawaguichi | 93 | * Garmin Kawaguichi |
| 94 | * Gryc Ueusp | 94 | * Gryc Ueusp |
| 95 | * Hiro Lecker | 95 | * Hiro Lecker |
| 96 | * Iain Oliver | ||
| 96 | * Imaze Rhiano | 97 | * Imaze Rhiano |
| 97 | * Intimidated | 98 | * Intimidated |
| 98 | * Jeremy Bongio (IBM) | 99 | * Jeremy Bongio (IBM) |
| @@ -182,12 +183,14 @@ what it is today. | |||
| 182 | 183 | ||
| 183 | This software uses components from the following developers: | 184 | This software uses components from the following developers: |
| 184 | * Sleepycat Software (Berkeley DB) | 185 | * Sleepycat Software (Berkeley DB) |
| 186 | * Aurora-Sim (http://aurora-sim.org) | ||
| 185 | * SQLite (Public Domain) | 187 | * SQLite (Public Domain) |
| 186 | * XmlRpcCS (http://xmlrpccs.sf.net/) | 188 | * XmlRpcCS (http://xmlrpccs.sf.net/) |
| 187 | * MySQL, Inc. (MySQL Connector/NET) | 189 | * MySQL, Inc. (MySQL Connector/NET) |
| 188 | * NUnit (http://www.nunit.org) | 190 | * NUnit (http://www.nunit.org) |
| 189 | * AGEIA Inc. (PhysX) | 191 | * AGEIA Inc. (PhysX) |
| 190 | * Russel L. Smith (ODE) | 192 | * Russel L. Smith (ODE) |
| 193 | * Erwin Coumans (Bullet) | ||
| 191 | * Prebuild (http://sourceforge.net/projects/dnpb/) | 194 | * Prebuild (http://sourceforge.net/projects/dnpb/) |
| 192 | * LibOpenMetaverse (http://lib.openmetaverse.org/) | 195 | * LibOpenMetaverse (http://lib.openmetaverse.org/) |
| 193 | * DotNetOpenMail v0.5.8b (http://dotnetopenmail.sourceforge.net) | 196 | * DotNetOpenMail v0.5.8b (http://dotnetopenmail.sourceforge.net) |