aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-11-27 19:17:54 -0500
committerTeravus Ovares (Dan Olivares)2009-11-27 19:17:54 -0500
commite7333515d95f063ce5dfe714b4cf34db85549a90 (patch)
treecf320591d49e96c67baffdb1f96c4165eafc2741 /CONTRIBUTORS.txt
parent* Re-enable lightweight packet tracking stats on a 3000 ms interval. (diff)
parentRename TestAssetDataPlugin to MockAssetDataPlugin (diff)
downloadopensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.zip
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.gz
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.bz2
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8744a08..174ce0a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -86,6 +86,7 @@ what it is today.
86* Kevin Cozens 86* Kevin Cozens
87* kinoc (Daxtron Labs) 87* kinoc (Daxtron Labs)
88* Kitto Flora 88* Kitto Flora
89* KittyLiu
89* Kurt Taylor (IBM) 90* Kurt Taylor (IBM)
90* lulurun 91* lulurun
91* M.Igarashi 92* M.Igarashi
@@ -104,6 +105,7 @@ what it is today.
104* otakup0pe 105* otakup0pe
105* ralphos 106* ralphos
106* RemedyTomm 107* RemedyTomm
108* Revolution
107* Richard Alimi (IBM) 109* Richard Alimi (IBM)
108* Rick Alther (IBM) 110* Rick Alther (IBM)
109* Rob Smart (IBM) 111* Rob Smart (IBM)