diff options
| author | Diva Canto | 2013-06-07 16:01:07 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-06-07 16:01:07 -0700 |
| commit | 6aa54a8e168edc40cf85672b2c6edced7db80266 (patch) | |
| tree | 4ab029b42ecf359794755bcc48bcb950c77b6c5a /CONTRIBUTORS.txt | |
| parent | Put the configuration back in FetchInventoryDesc2 cap. (diff) | |
| parent | minor: Comment out debug logging (at warn level) about number of objects forc... (diff) | |
| download | opensim-SC_OLD-6aa54a8e168edc40cf85672b2c6edced7db80266.zip opensim-SC_OLD-6aa54a8e168edc40cf85672b2c6edced7db80266.tar.gz opensim-SC_OLD-6aa54a8e168edc40cf85672b2c6edced7db80266.tar.bz2 opensim-SC_OLD-6aa54a8e168edc40cf85672b2c6edced7db80266.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 36b17be..7601a50 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -75,11 +75,12 @@ what it is today. | |||
| 75 | * controlbreak | 75 | * controlbreak |
| 76 | * coyled | 76 | * coyled |
| 77 | * Daedius | 77 | * Daedius |
| 78 | * Dong Jun Lan (IBM) | ||
| 79 | * DoranZemlja | ||
| 80 | * daTwitch | 78 | * daTwitch |
| 81 | * devalnor-#708 | 79 | * devalnor-#708 |
| 82 | * dmiles (Daxtron Labs) | 80 | * dmiles (Daxtron Labs) |
| 81 | * Dong Jun Lan (IBM) | ||
| 82 | * DoranZemlja | ||
| 83 | * dr0b3rts | ||
| 83 | * dslake (Intel) | 84 | * dslake (Intel) |
| 84 | * FredoChaplin | 85 | * FredoChaplin |
| 85 | * Garmin Kawaguichi | 86 | * Garmin Kawaguichi |