diff options
| author | Robert Adams | 2013-11-15 14:56:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-15 14:56:13 -0800 |
| commit | 604b39cea908029c80aa8ee5ff3aee5c8000c0e4 (patch) | |
| tree | bea875d6651531a030630e161b658c74d3aaf357 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.zip opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.gz opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.bz2 opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.xz | |
Merge branch 'master' into varregion
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 9ae7a31..ef84315 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -109,6 +109,7 @@ what it is today. | |||
| 109 | * Kayne | 109 | * Kayne |
| 110 | * Kevin Cozens | 110 | * Kevin Cozens |
| 111 | * kinoc (Daxtron Labs) | 111 | * kinoc (Daxtron Labs) |
| 112 | * Kira | ||
| 112 | * Kitto Flora | 113 | * Kitto Flora |
| 113 | * KittyLiu | 114 | * KittyLiu |
| 114 | * Kurt Taylor (IBM) | 115 | * Kurt Taylor (IBM) |