mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

merge with 3.3

Browse source
This commit is contained in:
Georg Brandl 2013-04-06 16:49:23 +02:00
commit a4f988c2bd
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/license.rst
View file

@ -124,6 +124,8 @@ been GPL-compatible; the table below summarizes the various releases.
+----------------+--------------+------------+------------+-----------------+
| 3.3.0 | 3.2 | 2012 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
| 3.3.1 | 3.3.0 | 2013 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
| 3.4.0 | 3.3.0 | 2014 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+

1
LICENSE
View file

@ -76,6 +76,7 @@ the various releases.
3.2.3 3.2.2 2012 PSF yes
3.2.4 3.2.3 2013 PSF yes
3.3.0 3.2 2012 PSF yes
3.3.1 3.3.0 2013 PSF yes
3.4.0 3.3.0 2014 PSF yes
Footnotes: