diff options
| author | Melanie | 2010-10-21 07:33:01 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-21 07:33:01 +0100 |
| commit | fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e (patch) | |
| tree | ffe3d70e95b159dc4c7b3bf9613bca865d4067d3 /CONTRIBUTORS.txt | |
| parent | COmmented the wrong line instead, now I commented them all to be on the safe ... (diff) | |
| parent | Skip empty strings in ParseString* functions (diff) | |
| download | opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.zip opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.gz opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.bz2 opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 2443244..38343a4 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -167,6 +167,7 @@ This software uses components from the following developers: | |||
| 167 | * GlynnTucker.Cache (http://gtcache.sourceforge.net/) | 167 | * GlynnTucker.Cache (http://gtcache.sourceforge.net/) |
| 168 | * NDesk.Options 0.2.1 (http://www.ndesk.org/Options) | 168 | * NDesk.Options 0.2.1 (http://www.ndesk.org/Options) |
| 169 | * Json.NET 3.5 Release 6. The binary used is actually Newtonsoft.Json.Net20.dll for Mono 2.4 compatability (http://james.newtonking.com/projects/json-net.aspx) | 169 | * Json.NET 3.5 Release 6. The binary used is actually Newtonsoft.Json.Net20.dll for Mono 2.4 compatability (http://james.newtonking.com/projects/json-net.aspx) |
| 170 | * zlib.net for C# 1.0.4 (http://www.componentace.com/zlib_.NET.htm) | ||
| 170 | 171 | ||
| 171 | Some plugins are based on Cable Beach | 172 | Some plugins are based on Cable Beach |
| 172 | Cable Beach is Copyright (c) 2008 Intel Corporation | 173 | Cable Beach is Copyright (c) 2008 Intel Corporation |