Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge from branches | Anthony Baxter | 2005-03-10 | 1 | -3/+5 |
| | |||||
* | In paragraph 1, changed | Tim Peters | 2004-10-26 | 1 | -2/+2 |
| | | | | | | Python software to this software ("Python") | ||||
* | Converted some stinking hard tabs. Left the fragrant hard tabs alone. | Tim Peters | 2004-10-23 | 1 | -1/+1 |
| | |||||
* | Move to version 2 of the PSF license, approved by the Board earlier today. | Tim Peters | 2004-10-23 | 1 | -12/+12 |
| | |||||
* | license updates for 2.4 (cleared with tim, on behalf of the psf) | Anthony Baxter | 2004-07-08 | 1 | -11/+12 |
| | |||||
* | Added 2.3.3 and 2.3.4 to the release table. Added 2004 to the list of | Tim Peters | 2004-05-11 | 1 | -3/+5 |
| | | | | copyright years. | ||||
* | added 2.3.2 | Anthony Baxter | 2003-09-30 | 1 | -0/+1 |
| | |||||
* | include 2.3.1 | Anthony Baxter | 2003-09-23 | 1 | -0/+1 |
| | |||||
* | Add historical note for Python 2.2.3 | Barry Warsaw | 2003-05-22 | 1 | -0/+1 |
| | |||||
* | Update the copyright year. | Guido van Rossum | 2003-01-02 | 1 | -1/+1 |
| | |||||
* | Various updates to the version number, on the eve of the 2.3a1 release. | Guido van Rossum | 2002-12-31 | 1 | -11/+12 |
| | |||||
* | Update info for impending 2.2.2. | Tim Peters | 2002-10-06 | 1 | -0/+1 |
| | |||||
* | At CNRI's request, I'm changing the status of 1.6.1 from | Guido van Rossum | 2002-04-11 | 1 | -1/+6 |
| | | | | | | not-GPL-compatible to GPL-compatible, with a footnote explaining that RMS disagrees. I'm not going to discuss this further -- both sides (CNRI and RMS) will argue their POV till they're blue in the face. | ||||
* | Update table of releases. | Tim Peters | 2002-04-08 | 1 | -0/+3 |
| | |||||
* | Removed old Digital Creations copyright/license notices (with | Guido van Rossum | 2002-04-04 | 1 | -5/+6 |
| | | | | | permission from Paul Everitt). Also removed a few other references to Digital Creations and changed the remaining ones to Zope Corporation. | ||||
* | Add 2002 to PSF copyrights. | Michael W. Hudson | 2002-02-27 | 1 | -2/+3 |
| | | | | | Doc/README is odd; it assigns some copyright to the PSF in 2000, when I didn't think it existed... | ||||
* | A new attempt at rationalizing the "history of the software" section, | Guido van Rossum | 2001-07-17 | 1 | -45/+60 |
| | | | | | | with a table clarifying which releases are GPL-compatible. Also unified the headings for the various licenses. | ||||
* | Note that 2.0.1 is also a PSF release. (Gregor Hoffleit, SF #433223.) | Guido van Rossum | 2001-06-14 | 1 | -5/+4 |
| | |||||
* | Make the license GPL-compatible. | Guido van Rossum | 2001-05-04 | 1 | -16/+5 |
| | |||||
* | Tim convinced me to augment the PSF license with a final clause just | Guido van Rossum | 2001-04-13 | 1 | -0/+4 |
| | | | | | like the one in the BeOpen license (and similar to the one in the CNRI license, but with the "click-to-accept" part elided). | ||||
* | Oops. Need an extra blank line after the PSF license. | Guido van Rossum | 2001-04-13 | 1 | -0/+1 |
| | |||||
* | - Inserted the (tentative) PSF license. | Guido van Rossum | 2001-04-13 | 1 | -9/+64 |
| | | | | | | | | - Removed the subsection numbering in section B (each time a new license is inserted in the front, the others have to be renumbered). - Changed the words in the intro to avoid implying that 1.6.1 is GPL-compatible. | ||||
* | Correct the header over the string of licenses -- it's "PYTHON", not | Guido van Rossum | 2001-04-10 | 1 | -2/+2 |
| | | | | "Python 1.6.1". | ||||
* | Fix typo in history. | Thomas Wouters | 2001-03-22 | 1 | -1/+1 |
| | |||||
* | Updated history. Incorporated 1.6.1 license. | Guido van Rossum | 2001-03-22 | 1 | -67/+76 |
| | |||||
* | Add note about copyright ownership and license situation. | Guido van Rossum | 2001-01-18 | 1 | -0/+10 |
| | |||||
* | Typo detected by "the miraculous Debian package lint tool "lintian" | Guido van Rossum | 2000-12-12 | 1 | -1/+1 |
| | | | | | | | (http://package.debian.org/lintian), which includes a spellchecker for common typos in control files of packages... You see, we're so paranoid that we even have automatic tools that keep monitoring license files ;-)" (Gregor Hoffleit) | ||||
* | Place the full text of the CNRI license verbatim in the LICENSE file. | Guido van Rossum | 2000-10-10 | 1 | -5/+67 |
| | | | | Who know where the handle will point to tomorrow? | ||||
* | Since it looks like the dual license clause may be neither necessary | Guido van Rossum | 2000-09-05 | 1 | -11/+5 |
| | | | | | | | | | | | | nor sufficient to make Python 2.0 compatible with the GPL, we won't bother with it now. In other words, we're still where we were weeks ago -- CNRI believes that its license is GPL-compatible, Stallman says it's not. I'm trying to arrange a meeting between their lawyers so they can work it out. Whether dual licensing is the solution is open at this point. If it is the (only!) solution, we'll add that to the BeOpen license for 2.0 final. | ||||
* | Changes in license names by BobW. | Guido van Rossum | 2000-09-04 | 1 | -3/+3 |
| | |||||
* | Properly name and number the BEOPEN OPEN SOURCE PYTHON LICENSE | Guido van Rossum | 2000-09-03 | 1 | -7/+5 |
| | | | | | | | | | | | | AGREEMENT VERSION 1. trade name -> trade names. Note: depending on community feedback, we may end up taking the dual licensing clause out for 2.0b1, and put it back into 2.0final, if there's no other solution for assuring GPL compatibility by then. See my message to python-dev and license-py20. | ||||
* | Various edits. Most importantly, added dual licensing. Also some | Guido van Rossum | 2000-09-03 | 1 | -34/+41 |
| | | | | changes suggested by BobW. | ||||
* | Tentative license. Could still change for the 2.0b1 release and will | Guido van Rossum | 2000-09-01 | 1 | -1/+103 |
| | | | | definitely change for the 2.0 final release. | ||||
* | Adding a LICENSE file so we can have it in the 1.6 release. | Guido van Rossum | 2000-08-02 | 1 | -0/+1 |