aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMelanie2012-03-11 01:55:36 +0100
committerMelanie2012-03-11 01:55:36 +0100
commit4f7ec1d691d769b9486c841c008e10aef164998f (patch)
tree443bd31819ac133d9878c0d906d250cad52e3831 /CONTRIBUTORS.txt
parentMerge branch 'ubitwork' (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-4f7ec1d691d769b9486c841c008e10aef164998f.zip
opensim-SC_OLD-4f7ec1d691d769b9486c841c008e10aef164998f.tar.gz
opensim-SC_OLD-4f7ec1d691d769b9486c841c008e10aef164998f.tar.bz2
opensim-SC_OLD-4f7ec1d691d769b9486c841c008e10aef164998f.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
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 e0a96e7..de5a6fc 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -86,6 +86,7 @@ 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
91* Imaze Rhiano 92* Imaze Rhiano
@@ -135,6 +136,7 @@ what it is today.
135* Ruud Lathorp 136* Ruud Lathorp
136* SachaMagne 137* SachaMagne
137* Salahzar Stenvaag 138* Salahzar Stenvaag
139* satguru p srivastava
138* sempuki 140* sempuki
139* SignpostMarv 141* SignpostMarv
140* SpotOn3D 142* SpotOn3D