aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-03-16 00:15:48 +0000
committerJustin Clark-Casey (justincc)2011-03-16 00:15:48 +0000
commit04e3ae3733028ed4c0d6f03d01239f2c98e2b5e0 (patch)
tree39deaed7eca2cb59195c7f4eb7e8308879dfbfd7
parentminor: bring comment into line with code reality (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-04e3ae3733028ed4c0d6f03d01239f2c98e2b5e0.zip
opensim-SC_OLD-04e3ae3733028ed4c0d6f03d01239f2c98e2b5e0.tar.gz
opensim-SC_OLD-04e3ae3733028ed4c0d6f03d01239f2c98e2b5e0.tar.bz2
opensim-SC_OLD-04e3ae3733028ed4c0d6f03d01239f2c98e2b5e0.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-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