aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorDiva Canto2010-02-22 09:56:33 -0800
committerDiva Canto2010-02-22 09:56:33 -0800
commitde91a9e09bbb6c41eeb022540ae08952f413fb12 (patch)
treef4a40f7999f9c55661162b2764c883f764597973 /CONTRIBUTORS.txt
parentDeleted duplicate [GridService] section. (diff)
parentMerge branch 'master' into presence-refactor (diff)
downloadopensim-SC-de91a9e09bbb6c41eeb022540ae08952f413fb12.zip
opensim-SC-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.gz
opensim-SC-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.bz2
opensim-SC-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.xz
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
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 13c05ef..5b4959a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -128,6 +128,7 @@ what it is today.
128* YZh 128* YZh
129* Zackary Geers aka Kunnis Basiat 129* Zackary Geers aka Kunnis Basiat
130* Zha Ewry 130* Zha Ewry
131* ziah
131 132
132 133
133= LSL Devs = 134= LSL Devs =