traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge with 3.3

This commit is contained in:
Georg Brandl 2013-04-06 16:49:23 +02:00
parent 98297f4807 03b273f4d1
commit a4f988c2bd
2 changed files with 3 additions and 0 deletions
Show Stats 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.0 | 3.2 | 2012 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+ +----------------+--------------+------------+------------+-----------------+
| 3.3.1 | 3.3.0 | 2013 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
| 3.4.0 | 3.3.0 | 2014 | 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.3 3.2.2 2012 PSF yes
3.2.4 3.2.3 2013 PSF yes 3.2.4 3.2.3 2013 PSF yes
3.3.0 3.2 2012 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 3.4.0 3.3.0 2014 PSF yes
Footnotes: Footnotes: