From 3d9ff88c7603bb405e556b174f4e90229703ed86 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 13 Dec 2009 14:29:42 +0000 Subject: Merged revisions 76787-76789 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76787 | benjamin.peterson | 2009-12-13 08:21:46 -0600 (Sun, 13 Dec 2009) | 9 lines Merged revisions 76785 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76785 | benjamin.peterson | 2009-12-13 08:18:08 -0600 (Sun, 13 Dec 2009) | 1 line add 2.6.x point releases ........ ................ r76788 | benjamin.peterson | 2009-12-13 08:23:30 -0600 (Sun, 13 Dec 2009) | 1 line fix markup ................ r76789 | benjamin.peterson | 2009-12-13 08:26:42 -0600 (Sun, 13 Dec 2009) | 1 line update 3.x versions ................ --- Doc/license.rst | 12 ++++++++++++ LICENSE | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/Doc/license.rst b/Doc/license.rst index eb266a7..b402c50 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -92,8 +92,20 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 2.6.1 | 2.6 | 2008 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ +| 2.6.2 | 2.6.1 | 2009 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ +| 2.6.3 | 2.6.2 | 2009 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ +| 2.6.4 | 2.6.3 | 2009 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ | 3.0 | 2.6 | 2008 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ +| 3.0.1 | 3.0 | 2009 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ +| 3.1 | 3.0.1 | 2009 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ +| 3.1.1 | 3.1 | 2009 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ .. note:: diff --git a/LICENSE b/LICENSE index d597478..9ce8288 100644 --- a/LICENSE +++ b/LICENSE @@ -59,7 +59,13 @@ the various releases. 2.5.3 2.5.2 2008 PSF yes 2.6 2.5 2008 PSF yes 2.6.1 2.6 2008 PSF yes + 2.6.2 2.6.1 2009 PSF yes + 2.6.3 2.6.2 2009 PSF yes + 2.6.4 2.6.3 2009 PSF yes 3.0 2.6 2008 PSF yes + 3.0.1 3.0 2009 PSF yes + 3.1 3.0.1 2009 PSF yes + 3.1.1 3.1 2009 PSF yes Footnotes: -- cgit v0.12