From: Benjamin Peterson Date: Sun, 13 Dec 2009 14:20:15 +0000 (+0000) Subject: Merged revisions 76785 via svnmerge from X-Git-Tag: v2.6.5rc1~281 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e363a5f716174194c615024e0865adcc83a63ae;p=thirdparty%2FPython%2Fcpython.git 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 ........ --- diff --git a/Doc/license.rst b/Doc/license.rst index 278bb2d84338..e7d3db5103e3 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -96,6 +96,12 @@ 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 | ++----------------+--------------+-----------+------------+-----------------+ .. note:: diff --git a/LICENSE b/LICENSE index 0f72a618c409..4ddcf09c2e6e 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 Footnotes: