diff options
author | Melanie | 2012-11-20 20:25:15 +0000 |
---|---|---|
committer | Melanie | 2012-11-20 20:25:15 +0000 |
commit | 45eedb635a6d51efba2549802b75ea1369274409 (patch) | |
tree | 2689020c58f6fae0872a130584331e84ba591d15 /CONTRIBUTORS.txt | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | If GetAgents() is called with an empty userIDs array then don't bother with a... (diff) | |
download | opensim-SC-45eedb635a6d51efba2549802b75ea1369274409.zip opensim-SC-45eedb635a6d51efba2549802b75ea1369274409.tar.gz opensim-SC-45eedb635a6d51efba2549802b75ea1369274409.tar.bz2 opensim-SC-45eedb635a6d51efba2549802b75ea1369274409.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 e5a6d49..43dea0b 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -93,6 +93,7 @@ what it is today. | |||
93 | * Garmin Kawaguichi | 93 | * Garmin Kawaguichi |
94 | * Gryc Ueusp | 94 | * Gryc Ueusp |
95 | * Hiro Lecker | 95 | * Hiro Lecker |
96 | * Iain Oliver | ||
96 | * Imaze Rhiano | 97 | * Imaze Rhiano |
97 | * Intimidated | 98 | * Intimidated |
98 | * Jeremy Bongio (IBM) | 99 | * Jeremy Bongio (IBM) |