diff options
| author | Melanie | 2013-06-30 18:27:30 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-30 18:27:30 +0100 |
| commit | ffcee82b1d62150b772464841023a29acc334c84 (patch) | |
| tree | 957d562be1f9e567daabb9bfdd25e779ec2c11a4 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Groups V2: charge for group creation only after the group has been successful... (diff) | |
| download | opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.zip opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.gz opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.bz2 opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to '')
| -rw-r--r-- | CONTRIBUTORS.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 7601a50..f621cd3 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -58,7 +58,7 @@ where we are today. | |||
| 58 | 58 | ||
| 59 | 59 | ||
| 60 | = Additional OpenSim Contributors = | 60 | = Additional OpenSim Contributors = |
| 61 | These folks have contributed code patches to OpenSim to help make it | 61 | These folks have contributed code patches or content to OpenSimulator to help make it |
| 62 | what it is today. | 62 | what it is today. |
| 63 | 63 | ||
| 64 | * aduffy70 | 64 | * aduffy70 |
| @@ -163,6 +163,7 @@ what it is today. | |||
| 163 | * webmage (IBM) | 163 | * webmage (IBM) |
| 164 | * Xantor | 164 | * Xantor |
| 165 | * Y. Nitta | 165 | * Y. Nitta |
| 166 | * YoshikoFazuku | ||
| 166 | * YZh | 167 | * YZh |
| 167 | * Zackary Geers aka Kunnis Basiat | 168 | * Zackary Geers aka Kunnis Basiat |
| 168 | * Zha Ewry | 169 | * Zha Ewry |
| @@ -215,5 +216,3 @@ In addition, we would like to thank: | |||
| 215 | * The Mono Project | 216 | * The Mono Project |
| 216 | * The NANT Developers | 217 | * The NANT Developers |
| 217 | * Microsoft (.NET, MSSQL-Adapters) | 218 | * Microsoft (.NET, MSSQL-Adapters) |
| 218 | *x | ||
| 219 | |||