aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMelanie2009-11-25 17:04:05 +0000
committerMelanie2009-11-25 17:04:05 +0000
commit79395bc7dbe5efbba604adae733c31cfbe9bf529 (patch)
treeff113c356963af91d5187d8ecc65cd3f3efc0f1a /CONTRIBUTORS.txt
parentChange osTeleportAgent parameters from long to int. That numerical range is (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-79395bc7dbe5efbba604adae733c31cfbe9bf529.zip
opensim-SC_OLD-79395bc7dbe5efbba604adae733c31cfbe9bf529.tar.gz
opensim-SC_OLD-79395bc7dbe5efbba604adae733c31cfbe9bf529.tar.bz2
opensim-SC_OLD-79395bc7dbe5efbba604adae733c31cfbe9bf529.tar.xz
Merge branch 'master' into careminster
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 ee263a1..8744a08 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -158,6 +158,7 @@ This software uses components from the following developers:
158* Nini (http://nini.sourceforge.net/) 158* Nini (http://nini.sourceforge.net/)
159* log4net (http://logging.apache.org/log4net/) 159* log4net (http://logging.apache.org/log4net/)
160* GlynnTucker.Cache (http://gtcache.sourceforge.net/) 160* GlynnTucker.Cache (http://gtcache.sourceforge.net/)
161* NDesk.Options 0.2.1 (http://www.ndesk.org/Options)
161 162
162Some plugins are based on Cable Beach 163Some plugins are based on Cable Beach
163Cable Beach is Copyright (c) 2008 Intel Corporation 164Cable Beach is Copyright (c) 2008 Intel Corporation