diff options
author | Diva Canto | 2014-05-07 17:00:12 -0700 |
---|---|---|
committer | Diva Canto | 2014-05-07 17:00:12 -0700 |
commit | f4cba27105f68914de455cf6a27b9126e086cea1 (patch) | |
tree | d87599f942f1e839dc4262f18c946564528314be /CONTRIBUTORS.txt | |
parent | Allow Tools.Configger to take -inifile as argument (diff) | |
parent | Add GridUserService service config to [UserAccountService] in Robust[.HG].ini... (diff) | |
download | opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.zip opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.tar.gz opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.tar.bz2 opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index f378925..fa79ea7 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -127,6 +127,7 @@ what it is today. | |||
127 | * maimedleech | 127 | * maimedleech |
128 | * Mana Janus | 128 | * Mana Janus |
129 | * MarcelEdward | 129 | * MarcelEdward |
130 | * Matt Lehmann | ||
130 | * Mic Bowman | 131 | * Mic Bowman |
131 | * Michelle Argus | 132 | * Michelle Argus |
132 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) | 133 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) |