diff options
| author | Melanie | 2010-02-15 00:20:48 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-15 00:20:48 +0000 |
| commit | c033223c63274ebe41075b24d108ca952fbd242c (patch) | |
| tree | 8c969a9643c469feb37133b175be18eb52fdff49 /CONTRIBUTORS.txt | |
| parent | Extraneous debug messages removed (diff) | |
| parent | Plug a small hole (diff) | |
| download | opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.zip opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.gz opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.bz2 opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.xz | |
Merge branch 'master' into presence-refactor
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 08048f5..13c05ef 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -120,6 +120,7 @@ what it is today. | |||
| 120 | * tglion | 120 | * tglion |
| 121 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) | 121 | * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) |
| 122 | * tyre | 122 | * tyre |
| 123 | * VikingErik | ||
| 123 | * Vytek | 124 | * Vytek |
| 124 | * webmage (IBM) | 125 | * webmage (IBM) |
| 125 | * Xantor | 126 | * Xantor |