diff options
author | Melanie | 2012-04-14 01:14:43 +0100 |
---|---|---|
committer | Melanie | 2012-04-14 01:14:43 +0100 |
commit | e8898710d55608378f7a65b3ecbf2f4b9e410c36 (patch) | |
tree | 58be37e5c9ff9a10844a889f8b3807e131e4faac | |
parent | Correct whitespace error introduced by previous commit (diff) | |
parent | Add Talun to the CONTRIBUTORS.txt, Thank you for the great patches (diff) | |
download | opensim-SC_OLD-e8898710d55608378f7a65b3ecbf2f4b9e410c36.zip opensim-SC_OLD-e8898710d55608378f7a65b3ecbf2f4b9e410c36.tar.gz opensim-SC_OLD-e8898710d55608378f7a65b3ecbf2f4b9e410c36.tar.bz2 opensim-SC_OLD-e8898710d55608378f7a65b3ecbf2f4b9e410c36.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r-- | CONTRIBUTORS.txt | 1 |
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 |