diff options
author | Justin Clark-Casey (justincc) | 2013-03-15 21:57:25 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-03-15 21:57:25 +0000 |
commit | 8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b (patch) | |
tree | 7040d86a73ec6829d79112f5865c166ab23b9b2f /CONTRIBUTORS.txt | |
parent | Make it possible to chain another asset service underneath the de-duplicating... (diff) | |
parent | Add Vegaslon to CONTRIBUTORS.txt (diff) | |
download | opensim-SC_OLD-8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b.zip opensim-SC_OLD-8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b.tar.gz opensim-SC_OLD-8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b.tar.bz2 opensim-SC_OLD-8cc3adb58504d3dc2a0b14503fd0d0e88b8e158b.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 5e50903..8ff55df 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -155,6 +155,7 @@ what it is today. | |||
155 | * tglion | 155 | * tglion |
156 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 156 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |
157 | * tyre | 157 | * tyre |
158 | * Vegaslon <vegaslon@gmail.com> | ||
158 | * VikingErik | 159 | * VikingErik |
159 | * Vytek | 160 | * Vytek |
160 | * webmage (IBM) | 161 | * webmage (IBM) |