diff options
| author | Diva Canto | 2014-05-23 16:20:04 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-05-23 16:20:04 -0700 |
| commit | 227685bea437d3e62c305e87415f5183a603d278 (patch) | |
| tree | 017f81fbf28f5944b6d26aa4833b30e1b52c9be7 /CONTRIBUTORS.txt | |
| parent | Adds optional HTTP Basic Authentication to Robust service connectors. (diff) | |
| parent | Fix issues where reported LSL compiler error line numbers do not match the sc... (diff) | |
| download | opensim-SC_OLD-227685bea437d3e62c305e87415f5183a603d278.zip opensim-SC_OLD-227685bea437d3e62c305e87415f5183a603d278.tar.gz opensim-SC_OLD-227685bea437d3e62c305e87415f5183a603d278.tar.bz2 opensim-SC_OLD-227685bea437d3e62c305e87415f5183a603d278.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 fa79ea7..1d080ff 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -134,6 +134,7 @@ what it is today. | |||
| 134 | * Micheil Merlin | 134 | * Micheil Merlin |
| 135 | * Mike Osias (IBM) | 135 | * Mike Osias (IBM) |
| 136 | * Mike Pitman (IBM) | 136 | * Mike Pitman (IBM) |
| 137 | * mikemig | ||
| 137 | * mikkopa/_someone - RealXtend | 138 | * mikkopa/_someone - RealXtend |
| 138 | * Misterblue | 139 | * Misterblue |
| 139 | * Mircea Kitsune | 140 | * Mircea Kitsune |