aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-28 23:43:42 +0100
committerJustin Clark-Casey (justincc)2011-04-28 23:43:42 +0100
commit5e578c97558c818a5d4738e140e9301dd2e86c44 (patch)
tree4bf3535e10e6dbcb1e5660115fc4c7c274da0e8e /CONTRIBUTORS.txt
parentStop CHANGED_INVENTORY firing twice if a notecard is edited in prim. (diff)
parentAdded MrMonkE to the contributors. Fixed contributors. (diff)
downloadopensim-SC-5e578c97558c818a5d4738e140e9301dd2e86c44.zip
opensim-SC-5e578c97558c818a5d4738e140e9301dd2e86c44.tar.gz
opensim-SC-5e578c97558c818a5d4738e140e9301dd2e86c44.tar.bz2
opensim-SC-5e578c97558c818a5d4738e140e9301dd2e86c44.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt37
1 files changed, 23 insertions, 14 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index ef00c19..246c669 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,34 +1,36 @@
1The following people have contributed to OpenSim (Thank you 1The following people have contributed to OpenSim (Thank you
2for your effort!) 2for your effort!)
3 3
4Add your name in here if you have committed to OpenSim
5
6= Current OpenSim Developers (in very rough order of appearance) = 4= Current OpenSim Developers (in very rough order of appearance) =
7These folks represent the current core team for OpenSim, and are the 5These folks represent the current core team for OpenSim, and are the
8people that make the day to day of OpenSim happen. 6people that make the day to day of OpenSim happen.
9 7
8* justincc
9* chi11ken (Genkii)
10* dahlia
11* Melanie Thielker
12* Diva (Crista Lopes, University of California, Irvine)
13* Dan Lake (Intel)
14* Marck
15* Mic Bowman (Intel)
16* BlueWall (James Hughes)
17
18= Core Developers Following the White Rabbit =
19Core developers who have temporarily (we hope) gone chasing the white rabbit.
20They are in all similar to the active core developers, except that they haven't
21been that active lately, so their voting rights are awaiting their come back.
22
10* MW (Tribal Media AB) 23* MW (Tribal Media AB)
11* Adam Frisby (DeepThink Pty Ltd) 24* Adam Frisby (DeepThink Pty Ltd)
12* MingChen (DeepThink Pty Ltd)
13* lbsa71 (Tribal Media AB) 25* lbsa71 (Tribal Media AB)
14* Sean Dague / sdague (IBM)
15* Tedd
16* justincc
17* Teravus (w3z) 26* Teravus (w3z)
18* Johan Berntsson (3Di)
19* Ckrinke (Charles Krinke) 27* Ckrinke (Charles Krinke)
20* chi11ken (Genkii)
21* adjohn (Genkii)
22* Dr Scofield aka Dirk Husemann (IBM Research - Zurich) 28* Dr Scofield aka Dirk Husemann (IBM Research - Zurich)
23* dahlia
24* mikem (3Di) 29* mikem (3Di)
25* Melanie Thielker
26* Homer_Horwitz 30* Homer_Horwitz
27* idb (Ian Brown)
28* Diva (Crista Lopes, University of California, Irvine)
29* nlin (3Di) 31* nlin (3Di)
30* Arthur Rodrigo S Valadares (IBM) 32* Arthur Rodrigo S Valadares (IBM)
31* BlueWall (James Hughes) 33* John Hurliman
32 34
33= Past Open Sim Developers = 35= Past Open Sim Developers =
34These folks are alumns of the OpenSim core group, but are now 36These folks are alumns of the OpenSim core group, but are now
@@ -44,6 +46,12 @@ where we are today.
44* Dalien 46* Dalien
45* Darok 47* Darok
46* Alondria 48* Alondria
49* Sean Dague / sdague (IBM)
50* Tedd
51* MingChen (DeepThink Pty Ltd)
52* adjohn (Genkii)
53* idb (Ian Brown)
54* Johan Berntsson (3Di)
47 55
48 56
49= Additional OpenSim Contributors = 57= Additional OpenSim Contributors =
@@ -102,6 +110,7 @@ what it is today.
102* Misterblue (Intel) 110* Misterblue (Intel)
103* Mircea Kitsune 111* Mircea Kitsune
104* mpallari 112* mpallari
113* MrMonkE
105* nornalbion 114* nornalbion
106* Omar Vera Ustariz (IBM) 115* Omar Vera Ustariz (IBM)
107* openlifegrid.com 116* openlifegrid.com