aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorDan Lake2012-03-27 12:51:58 -0700
committerDan Lake2012-03-27 12:51:58 -0700
commit971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree2607c27fad429ff0036fe7b7d275ddf717397282 /CONTRIBUTORS.txt
parentWhen loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parentHG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
downloadopensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.zip
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index e0a96e7..31aeda3 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -86,8 +86,10 @@ what it is today.
86* Grumly57 86* Grumly57
87* GuduleLapointe 87* GuduleLapointe
88* Ewe Loon 88* Ewe Loon
89* Fernando Oliveira
89* Fly-Man 90* Fly-Man
90* Flyte Xevious 91* Flyte Xevious
92* Garmin Kawaguichi
91* Imaze Rhiano 93* Imaze Rhiano
92* Intimidated 94* Intimidated
93* Jeremy Bongio (IBM) 95* Jeremy Bongio (IBM)
@@ -106,6 +108,7 @@ what it is today.
106* M.Igarashi 108* M.Igarashi
107* maimedleech 109* maimedleech
108* Mana Janus 110* Mana Janus
111* MarcelEdward
109* Mic Bowman 112* Mic Bowman
110* Michelle Argus 113* Michelle Argus
111* Michael Cortez (The Flotsam Project, http://osflotsam.org/) 114* Michael Cortez (The Flotsam Project, http://osflotsam.org/)
@@ -135,6 +138,7 @@ what it is today.
135* Ruud Lathorp 138* Ruud Lathorp
136* SachaMagne 139* SachaMagne
137* Salahzar Stenvaag 140* Salahzar Stenvaag
141* satguru p srivastava
138* sempuki 142* sempuki
139* SignpostMarv 143* SignpostMarv
140* SpotOn3D 144* SpotOn3D