aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMelanie2012-03-27 18:11:05 +0100
committerMelanie2012-03-27 18:11:05 +0100
commit6b5f3b49e783be3012f84d25bd986927c5a3e3e7 (patch)
tree35187e0f7c0bb0ca7b712e02b56c91ae5ecfd3ee /CONTRIBUTORS.txt
parentReplace HG linker with core version (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.zip
opensim-SC-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.tar.gz
opensim-SC-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.tar.bz2
opensim-SC-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index e6956bb..31aeda3 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -89,6 +89,7 @@ what it is today.
89* Fernando Oliveira 89* Fernando Oliveira
90* Fly-Man 90* Fly-Man
91* Flyte Xevious 91* Flyte Xevious
92* Garmin Kawaguichi
92* Imaze Rhiano 93* Imaze Rhiano
93* Intimidated 94* Intimidated
94* Jeremy Bongio (IBM) 95* Jeremy Bongio (IBM)