merge with 3.3
This commit is contained in:
commit
a4f988c2bd
|
@ -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
1
LICENSE
|
@ -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:
|
||||||
|
|
Loading…
Reference in New Issue