aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-18 23:00:48 -0400
committerJonathan Freedman2010-10-18 23:00:48 -0400
commit12128f1917d9f6288e268ccce9304c2b8c825d92 (patch)
treea1825bf495e15aadb86ce0ce457007717933988c /CONTRIBUTORS.txt
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
parentAdd 'contributors' notice for zlib.net.dll to keep track of its origin and ve... (diff)
downloadopensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.zip
opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.tar.gz
opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.tar.bz2
opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
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 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
171Some plugins are based on Cable Beach 172Some plugins are based on Cable Beach
172Cable Beach is Copyright (c) 2008 Intel Corporation 173Cable Beach is Copyright (c) 2008 Intel Corporation