diff options
| author | Melanie | 2013-02-10 20:01:51 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-10 20:01:51 +0000 |
| commit | 12f732fd3f1883dc016fc801bfd834290aa1cd06 (patch) | |
| tree | 8d1a23a04f8c206b5bf0a79ce510c62ee7dc23ed /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix code to check for no spawn points. Possibly a merge artefact? (diff) | |
| download | opensim-SC_OLD-12f732fd3f1883dc016fc801bfd834290aa1cd06.zip opensim-SC_OLD-12f732fd3f1883dc016fc801bfd834290aa1cd06.tar.gz opensim-SC_OLD-12f732fd3f1883dc016fc801bfd834290aa1cd06.tar.bz2 opensim-SC_OLD-12f732fd3f1883dc016fc801bfd834290aa1cd06.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 43dea0b..5e50903 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -65,6 +65,7 @@ what it is today. | |||
| 65 | * A_Biondi | 65 | * A_Biondi |
| 66 | * alex_carnell | 66 | * alex_carnell |
| 67 | * Alan Webb (IBM) | 67 | * Alan Webb (IBM) |
| 68 | * Allen Kerensky | ||
| 68 | * BigFootAg | 69 | * BigFootAg |
| 69 | * BlueWall Slade | 70 | * BlueWall Slade |
| 70 | * brianw/Sir_Ahzz | 71 | * brianw/Sir_Ahzz |