diff options
| author | Melanie | 2012-03-28 02:46:54 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-28 02:46:54 +0100 |
| commit | 300488f8621004c5927dd31ab85e0f796f9373bd (patch) | |
| tree | 098ba7f741d0404f0e6c2d46fa90e5ad21a36da2 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-300488f8621004c5927dd31ab85e0f796f9373bd.zip opensim-SC-300488f8621004c5927dd31ab85e0f796f9373bd.tar.gz opensim-SC-300488f8621004c5927dd31ab85e0f796f9373bd.tar.bz2 opensim-SC-300488f8621004c5927dd31ab85e0f796f9373bd.tar.xz | |
Merge branch 'master' into careminster
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 31aeda3..089d2f5 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | The following people have contributed to OpenSim (Thank you | 1 | <<<>>>>The following people have contributed to OpenSim (Thank you |
| 2 | for your effort!) | 2 | for your effort!) |
| 3 | 3 | ||
| 4 | = Current OpenSim Developers (in very rough order of appearance) = | 4 | = Current OpenSim Developers (in very rough order of appearance) = |