diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-10-27 19:13:16 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-10-27 19:13:16 +0000 |
| commit | bd3484417d170e62bc94e9db81d4ad37e8ddee6a (patch) | |
| tree | 1240015cf67d26fecf4e8a31669b53984a6bc7ed | |
| parent | 9488ae779a5b0930a98d2d71f387eb9596428ad9 (diff) | |
| download | elgg-bd3484417d170e62bc94e9db81d4ad37e8ddee6a.tar.gz elgg-bd3484417d170e62bc94e9db81d4ad37e8ddee6a.tar.bz2 | |
Updated readme to reflect the MIT license. Updated contributors to be a flat list.
git-svn-id: http://code.elgg.org/elgg/trunk@7123 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | CONTRIBUTORS.txt | 35 | ||||
| -rw-r--r-- | README.txt | 10 |
2 files changed, 22 insertions, 23 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 163b19d9c..dfdcebe5e 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,29 +1,28 @@ -CORE ELGG TEAM: +These developers have developed or contributed significant bodies of code +to the Elgg Project. (List in alphabetical order.) -Dave Tosh <dave@elgg.com> -http://twitter.com/davetosh +Cash Costello - http://cashcostello.com/ -Brett Profitt <brett@elgg.com> -http://twitter.com/brettprofitt +Pete Harris - pete@elgg.com -Pete Harris <pete@elgg.com> +Milan Magudia - http://hedgehogs.net/ -Nicholas Whitt <nick@elgg.com> -http://twitter.com/nogoodnick +Jon Maul - MITRE http://www.mitre.org/ +Marcus Povey - http://marcuspovey.co.uk/ -CONTRIBUTING DEVELOPERS +Brett Profitt - brett.profitt@gmail.com, http://twitter.com/brettprofitt -Cash Costello - http://cashcostello.com/ -Justin Richer, Nathan Rackliffe, Tom Read, Jon Maul - MITRE http://www.mitre.org/ -Milan Magudia - http://hedgehogs.net/ -Evan Winslow - http://evanwinslow.com/ +Nathan Rackliffe - MITRE http://mitre.org/ + +Tom Readi - MITRE http://mitre.org/ +Justin Richer - MITRE http://mitre.org/ -ALUMNI DEVELOPERS +Dave Tosh - davidgtosh@gmail.com, http://twitter.com/davetosh -Ben Werdmuller -http://benwerd.com/ +Ben Werdmuller - http://benwerd.com/ -Marcus Povey -http://marcuspovey.co.uk/ +Nicholas Whitt - nick.whitt@gmail.com, http://twitter.com/nogoodnick + +Evan Winslow - http://evanwinslow.com/ diff --git a/README.txt b/README.txt index 3f9f5b234..5494ff984 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,5 @@ Elgg version 1.8 -Copyright (c) 2008-2010 Curverider Ltd +Copyright (c) 2008-2010 See COPYRIGHT.txt This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by @@ -21,12 +21,12 @@ ABOUT: See CONTRIBUTORS.txt for development credits. Elgg concept originally by: -Ben Werdmuller <ben@benwerd.com, http://benwerd.com> and David Tosh <dave@elgg.com> +Ben Werdmuller <ben@benwerd.com, http://benwerd.com> and David Tosh <davidgtosh@gmail.com> The open source project site can be found at http://elgg.org/ -Elgg is released under the GNU Public License (GPL), which -is supplied in this distribution as LICENSE. +Elgg is released under the GNU Public License (GPL) and the Massachusetts +Institute of Technology (MIT) License, which is supplied in this +distribution as LICENSE. For installation instructions, please see the INSTALL file. - |