aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authordahlia2010-07-01 20:50:24 -0700
committerDiva Canto2010-07-02 09:45:57 -0700
commit04e2390e0d771a7c53cd35ba9b85047c93d16faf (patch)
tree54d37f743ff6926d95f6f1e57892f9f9a864c67d /CONTRIBUTORS.txt
parentFox another scripting nasty. Stuff no system.string objects into lists (diff)
downloadopensim-SC_OLD-04e2390e0d771a7c53cd35ba9b85047c93d16faf.zip
opensim-SC_OLD-04e2390e0d771a7c53cd35ba9b85047c93d16faf.tar.gz
opensim-SC_OLD-04e2390e0d771a7c53cd35ba9b85047c93d16faf.tar.bz2
opensim-SC_OLD-04e2390e0d771a7c53cd35ba9b85047c93d16faf.tar.xz
add Micheil Merlin to CONTRIBUTORS.txt (Mantis #4784)
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt1
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