diff options
author | Diva Canto | 2010-07-02 06:36:08 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-02 06:36:08 -0700 |
commit | 79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53 (patch) | |
tree | 94689bae9d0813616dc9f487824d17d8954f0414 /CONTRIBUTORS.txt | |
parent | Fixes mantis #4782 (diff) | |
parent | Clean up IMoneyModule and adjust the other modules to the changes (diff) | |
download | opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.zip opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.gz opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.bz2 opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.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 9aadd70..2443244 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -95,6 +95,7 @@ what it is today. | |||
95 | * Mic Bowman | 95 | * Mic Bowman |
96 | * Michelle Argus | 96 | * Michelle Argus |
97 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) | 97 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) |
98 | * Micheil Merlin | ||
98 | * Mike Osias (IBM) | 99 | * Mike Osias (IBM) |
99 | * Mike Pitman (IBM) | 100 | * Mike Pitman (IBM) |
100 | * mikkopa/_someone - RealXtend | 101 | * mikkopa/_someone - RealXtend |