aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorBlueWall2012-10-03 19:14:40 -0400
committerBlueWall2012-10-03 19:14:40 -0400
commite6c9b0900615ac41d56f1fbd3ea30a6308b22f96 (patch)
tree7cc9f82783ef8826a13e169a9d43ef9ec5d98cfc /CONTRIBUTORS.txt
parentAdd modular configuration for Robust connectors (diff)
parentSoliciting for comments on smoothness of physics objects for this build. (diff)
downloadopensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.zip
opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.gz
opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.bz2
opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim into modular_config
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 a16d174..fd00fe8 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -16,7 +16,7 @@ people that make the day to day of OpenSim happen.
16* BlueWall (James Hughes) 16* BlueWall (James Hughes)
17* Nebadon Izumi (Michael Cerquoni, OSgrid) 17* Nebadon Izumi (Michael Cerquoni, OSgrid)
18* Snoopy Pfeffer 18* Snoopy Pfeffer
19* Richard Adams (Intel) 19* Robert Adams (Intel)
20 20
21= Core Developers Following the White Rabbit = 21= Core Developers Following the White Rabbit =
22Core developers who have temporarily (we hope) gone chasing the white rabbit. 22Core developers who have temporarily (we hope) gone chasing the white rabbit.