diff options
| author | Melanie | 2010-02-22 03:00:59 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-22 03:00:59 +0000 |
| commit | 1f45e6c6497e05638f014e92098165befbbea100 (patch) | |
| tree | 0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /CONTRIBUTORS.txt | |
| parent | One more test running. (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.zip opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.gz opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2 opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.xz | |
Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
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 13c05ef..5b4959a 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -128,6 +128,7 @@ what it is today. | |||
| 128 | * YZh | 128 | * YZh |
| 129 | * Zackary Geers aka Kunnis Basiat | 129 | * Zackary Geers aka Kunnis Basiat |
| 130 | * Zha Ewry | 130 | * Zha Ewry |
| 131 | * ziah | ||
| 131 | 132 | ||
| 132 | 133 | ||
| 133 | = LSL Devs = | 134 | = LSL Devs = |