diff options
| author | Melanie | 2013-04-28 19:03:39 +0200 |
|---|---|---|
| committer | Melanie | 2013-04-28 19:03:39 +0200 |
| commit | 4275d7a839d7380ee50aeadc38a31dd467bd891e (patch) | |
| tree | 1e589fc3b448b580d1cc25b52215ef5ce2d7ae78 /CONTRIBUTORS.txt | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Controller module for dynamic floaters (WIP) (diff) | |
| download | opensim-SC_OLD-4275d7a839d7380ee50aeadc38a31dd467bd891e.zip opensim-SC_OLD-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.gz opensim-SC_OLD-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.bz2 opensim-SC_OLD-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
bin/Regions/Regions.ini.example
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 43dea0b..8ff55df 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 |
| @@ -154,6 +155,7 @@ what it is today. | |||
| 154 | * tglion | 155 | * tglion |
| 155 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 156 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |
| 156 | * tyre | 157 | * tyre |
| 158 | * Vegaslon <vegaslon@gmail.com> | ||
| 157 | * VikingErik | 159 | * VikingErik |
| 158 | * Vytek | 160 | * Vytek |
| 159 | * webmage (IBM) | 161 | * webmage (IBM) |