diff options
| author | Melanie | 2010-07-02 04:21:48 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-02 04:21:48 +0100 |
| commit | a4b7863ea1bc25f101832fb871a7bef1f9bffa1d (patch) | |
| tree | 31cb97bef9b1cafe08a3c22677c045907eeb9f1e | |
| parent | Fox another scripting nasty. Stuff no system.string objects into lists (diff) | |
| parent | add Micheil Merlin to CONTRIBUTORS.txt (Mantis #4784) (diff) | |
| download | opensim-SC-a4b7863ea1bc25f101832fb871a7bef1f9bffa1d.zip opensim-SC-a4b7863ea1bc25f101832fb871a7bef1f9bffa1d.tar.gz opensim-SC-a4b7863ea1bc25f101832fb871a7bef1f9bffa1d.tar.bz2 opensim-SC-a4b7863ea1bc25f101832fb871a7bef1f9bffa1d.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
| -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 |