Mercurial > cpython-lru_cache-weakref

changeset 57688:c915ff591a2f 3.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ................
author Benjamin Peterson <benjamin@python.org>
date Sun, 13 Dec 2009 14:29:42 +0000
parents 8c47d7d2a023
children a74e04fc93eb
files Doc/license.rst LICENSE
diffstat 2 files changed, 18 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Doc/license.rst	Sun Dec 13 11:43:59 2009 +0000
+++ b/Doc/license.rst	Sun Dec 13 14:29:42 2009 +0000
@@ -92,8 +92,20 @@
 +----------------+--------------+------------+------------+-----------------+
 | 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::
--- a/LICENSE	Sun Dec 13 11:43:59 2009 +0000
+++ b/LICENSE	Sun Dec 13 14:29:42 2009 +0000
@@ -59,7 +59,13 @@
     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: