From: Georg Brandl Date: Sat, 6 Apr 2013 14:49:23 +0000 (+0200) Subject: merge with 3.3 X-Git-Tag: v3.4.0a1~1022 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4f988c2bde9c060b05758ef7c451e34c9b8caab;p=python merge with 3.3 --- a4f988c2bde9c060b05758ef7c451e34c9b8caab diff --cc Doc/license.rst index c3d5d75ef2,aacfaa108c..b09e9a8176 --- a/Doc/license.rst +++ b/Doc/license.rst @@@ -123,9 -123,9 +123,11 @@@ been GPL-compatible; the table below su | 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 | ++----------------+--------------+------------+------------+-----------------+ .. note:: diff --cc LICENSE index 3e8460d6a6,6cbd96334a..c9cb72c35d --- a/LICENSE +++ b/LICENSE @@@ -76,7 -76,7 +76,8 @@@ 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: