aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-04-14 01:14:43 +0100
committerMelanie2012-04-14 01:14:43 +0100
commite8898710d55608378f7a65b3ecbf2f4b9e410c36 (patch)
tree58be37e5c9ff9a10844a889f8b3807e131e4faac
parentCorrect whitespace error introduced by previous commit (diff)
parentAdd Talun to the CONTRIBUTORS.txt, Thank you for the great patches (diff)
downloadopensim-SC-e8898710d55608378f7a65b3ecbf2f4b9e410c36.zip
opensim-SC-e8898710d55608378f7a65b3ecbf2f4b9e410c36.tar.gz
opensim-SC-e8898710d55608378f7a65b3ecbf2f4b9e410c36.tar.bz2
opensim-SC-e8898710d55608378f7a65b3ecbf2f4b9e410c36.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--CONTRIBUTORS.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 287073b..1370449 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -144,6 +144,7 @@ what it is today.
144* SignpostMarv 144* SignpostMarv
145* SpotOn3D 145* SpotOn3D
146* Strawberry Fride 146* Strawberry Fride
147* Talun
147* tglion 148* tglion
148* tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) 149* tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud)
149* tyre 150* tyre