aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-01-14 01:19:54 +0000
committerJustin Clark-Casey (justincc)2014-01-14 01:19:54 +0000
commit4675a2fb29f71451c2d9b5983cef1ecd28d5eb34 (patch)
tree88d8f3ea04cc6fac01a687b75f9856ca6e9348fd
parentFix crash in BulletSim which sometimes happens making a linkset physical (diff)
parentminor: Add David Rowe to ctrlaltdavid handle by request (diff)
downloadopensim-SC-4675a2fb29f71451c2d9b5983cef1ecd28d5eb34.zip
opensim-SC-4675a2fb29f71451c2d9b5983cef1ecd28d5eb34.tar.gz
opensim-SC-4675a2fb29f71451c2d9b5983cef1ecd28d5eb34.tar.bz2
opensim-SC-4675a2fb29f71451c2d9b5983cef1ecd28d5eb34.tar.xz
Merge branch 'justincc-master'
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index ee3d7c7..9114fc5 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -75,7 +75,7 @@ what it is today.
75* Chris Yeoh (IBM) 75* Chris Yeoh (IBM)
76* controlbreak 76* controlbreak
77* coyled 77* coyled
78* ctrlaltdavid 78* ctrlaltdavid (David Rowe)
79* Daedius 79* Daedius
80* daTwitch 80* daTwitch
81* devalnor-#708 81* devalnor-#708