diff options
author | Melanie | 2010-05-31 17:57:48 +0100 |
---|---|---|
committer | Melanie | 2010-05-31 17:57:48 +0100 |
commit | 0526a91206a64cb43be29d61d472a98f5a031b74 (patch) | |
tree | 061ab41ebe056e48794de5fd296c8af576471c1e /CONTRIBUTORS.txt | |
parent | Fix casting in llParcelMediaCommandList so that it actually, you know, works (diff) | |
parent | Fix a nullref in EventManager caused by RegionReady not setting the scene (diff) | |
download | opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.zip opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.gz opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.bz2 opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.xz |
Merge branch '0.6.9-post-fixes' into careminster
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 5b4959a..e5c8cb9 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -164,6 +164,7 @@ This software uses components from the following developers: | |||
164 | * log4net (http://logging.apache.org/log4net/) | 164 | * log4net (http://logging.apache.org/log4net/) |
165 | * GlynnTucker.Cache (http://gtcache.sourceforge.net/) | 165 | * GlynnTucker.Cache (http://gtcache.sourceforge.net/) |
166 | * NDesk.Options 0.2.1 (http://www.ndesk.org/Options) | 166 | * NDesk.Options 0.2.1 (http://www.ndesk.org/Options) |
167 | * 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) | ||
167 | 168 | ||
168 | Some plugins are based on Cable Beach | 169 | Some plugins are based on Cable Beach |
169 | Cable Beach is Copyright (c) 2008 Intel Corporation | 170 | Cable Beach is Copyright (c) 2008 Intel Corporation |