From d94dfe84f8d3c9b3c49e6ab00af662af829c168b Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 13 Dec 2009 14:21:46 +0000 Subject: [PATCH] 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 ........ --- Doc/license.rst | 6 ++++++ LICENSE | 3 +++ 2 files changed, 9 insertions(+) diff --git a/Doc/license.rst b/Doc/license.rst index 7b77b60682f..9451be081d0 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -98,6 +98,12 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 3.2 | 3.1 | 2009 | 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 | ++----------------+--------------+-----------+------------+-----------------+ .. note:: diff --git a/LICENSE b/LICENSE index 7a3857e0ff3..6c1ce01cba5 100644 --- a/LICENSE +++ b/LICENSE @@ -59,6 +59,9 @@ 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.1 3.0 2009 PSF yes 3.2 3.1 2009 PSF yes