Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.8.2-post-fixes
Diva Canto 2015-09-05 10:29:18 -07:00
commit bba79424b6
1 changed files with 2 additions and 2 deletions

View File

@ -4,8 +4,7 @@ The following people have contributed to OpenSim (Thank you for your effort!)
These folks represent the current core team for OpenSim, and are the These folks represent the current core team for OpenSim, and are the
people that make the day to day of OpenSim happen. people that make the day to day of OpenSim happen.
* justincc (OSVW Consulting, justincc.org) * justincc (OSVW Consulting, justincc.org)
* dahlia
* Melanie Thielker * Melanie Thielker
* Diva (Crista Lopes, University of California, Irvine) * Diva (Crista Lopes, University of California, Irvine)
* BlueWall (James Hughes) * BlueWall (James Hughes)
@ -56,6 +55,7 @@ where we are today.
* nlin (3Di) * nlin (3Di)
* John Hurliman * John Hurliman
* chi11ken (Genkii) * chi11ken (Genkii)
* dahlia
= Additional OpenSim Contributors = = Additional OpenSim Contributors =