diff options
| author | Robert Adams | 2013-11-06 06:32:11 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-06 06:32:11 -0800 |
| commit | f7bd0da026cc7af4ee249e175412ef056ffb8761 (patch) | |
| tree | d8feb5d26b1789b5689b0a1ddd0722ef622c87d1 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | add support for particle glow LSL functions (diff) | |
| download | opensim-SC_OLD-f7bd0da026cc7af4ee249e175412ef056ffb8761.zip opensim-SC_OLD-f7bd0da026cc7af4ee249e175412ef056ffb8761.tar.gz opensim-SC_OLD-f7bd0da026cc7af4ee249e175412ef056ffb8761.tar.bz2 opensim-SC_OLD-f7bd0da026cc7af4ee249e175412ef056ffb8761.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index a4bcb91..9ae7a31 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -7,7 +7,7 @@ people that make the day to day of OpenSim happen. | |||
| 7 | 7 | ||
| 8 | * justincc (OSVW Consulting, justincc.org) | 8 | * justincc (OSVW Consulting, justincc.org) |
| 9 | * chi11ken (Genkii) | 9 | * chi11ken (Genkii) |
| 10 | * dahlia | 10 | * dahlia |
| 11 | * Melanie Thielker | 11 | * Melanie Thielker |
| 12 | * Diva (Crista Lopes, University of California, Irvine) | 12 | * Diva (Crista Lopes, University of California, Irvine) |
| 13 | * Dan Lake (Intel) | 13 | * Dan Lake (Intel) |