diff options
author | Diva Canto | 2012-03-17 10:00:43 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-17 10:00:43 -0700 |
commit | d87a5758fb648b5e314950ac35050fbf5af9e3df (patch) | |
tree | 4cb978de354d265418187d4edb30b54dddf21448 /CONTRIBUTORS.txt | |
parent | Region access control! Region operators can now specify things like DisallowF... (diff) | |
parent | Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927 (diff) | |
download | opensim-SC_OLD-d87a5758fb648b5e314950ac35050fbf5af9e3df.zip opensim-SC_OLD-d87a5758fb648b5e314950ac35050fbf5af9e3df.tar.gz opensim-SC_OLD-d87a5758fb648b5e314950ac35050fbf5af9e3df.tar.bz2 opensim-SC_OLD-d87a5758fb648b5e314950ac35050fbf5af9e3df.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index de5a6fc..e6956bb 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -107,6 +107,7 @@ what it is today. | |||
107 | * M.Igarashi | 107 | * M.Igarashi |
108 | * maimedleech | 108 | * maimedleech |
109 | * Mana Janus | 109 | * Mana Janus |
110 | * MarcelEdward | ||
110 | * Mic Bowman | 111 | * Mic Bowman |
111 | * Michelle Argus | 112 | * Michelle Argus |
112 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) | 113 | * Michael Cortez (The Flotsam Project, http://osflotsam.org/) |