aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorKitto Flora2011-03-22 20:33:24 +0000
committerKitto Flora2011-03-22 20:33:24 +0000
commit764e8c2a4371c24d1a0bd067c0bcbc806562064d (patch)
tree03dfb1bfe16c420fdbb6a1aa723c9203771d1beb /CONTRIBUTORS.txt
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentAdd some more fields to Estate settings and make them work. (diff)
downloadopensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.zip
opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.tar.gz
opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.tar.bz2
opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 38343a4..a0af1ca 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -28,7 +28,7 @@ people that make the day to day of OpenSim happen.
28* Diva (Crista Lopes, University of California, Irvine) 28* Diva (Crista Lopes, University of California, Irvine)
29* nlin (3Di) 29* nlin (3Di)
30* Arthur Rodrigo S Valadares (IBM) 30* Arthur Rodrigo S Valadares (IBM)
31 31* BlueWall (James Hughes)
32 32
33= Past Open Sim Developers = 33= Past Open Sim Developers =
34These folks are alumns of the OpenSim core group, but are now 34These folks are alumns of the OpenSim core group, but are now