diff options
| author | Mike Rieker | 2010-07-06 02:23:10 +0000 |
|---|---|---|
| committer | Mike Rieker | 2010-07-06 02:23:10 +0000 |
| commit | 6e7f1a3ac11b889175c87f59a3c5361c704363a6 (patch) | |
| tree | 2ed5bebf54db3adc420e1510045b84b880ecb157 /CONTRIBUTORS.txt | |
| parent | rewrote hanging llParseStringKeepNulls() (diff) | |
| parent | Undo fix is now complete. This commit repairs the special case of the root pr... (diff) | |
| download | opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.zip opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.gz opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.bz2 opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.xz | |
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
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 |