Author: mattip <matti.pi...@gmail.com>
Branch: release-4.0.x
Changeset: r80368:65ac40781e5e
Date: 2015-10-21 10:11 +1100
http://bitbucket.org/pypy/pypy/changeset/65ac40781e5e/
Log: merge default into branch
diff --git a/pypy/doc/index-of-release-notes.rst
b/pypy/doc/index-of-release-notes.rst
--- a/pypy/doc/index-of-release-notes.rst
+++ b/pypy/doc/index-of-release-notes.rst
@@ -6,7 +6,7 @@
.. toctree::
- release-15.11.0.rst
+ release-4.0.0.rst
release-2.6.1.rst
release-2.6.0.rst
release-2.5.1.rst
diff --git a/pypy/doc/index-of-whatsnew.rst b/pypy/doc/index-of-whatsnew.rst
--- a/pypy/doc/index-of-whatsnew.rst
+++ b/pypy/doc/index-of-whatsnew.rst
@@ -7,7 +7,7 @@
.. toctree::
whatsnew-head.rst
- whatsnew-15.11.0.rst
+ whatsnew-4.0.0.rst
whatsnew-2.6.1.rst
whatsnew-2.6.0.rst
whatsnew-2.5.1.rst
diff --git a/pypy/doc/whatsnew-4.0.0.rst b/pypy/doc/whatsnew-4.0.0.rst
--- a/pypy/doc/whatsnew-4.0.0.rst
+++ b/pypy/doc/whatsnew-4.0.0.rst
@@ -3,7 +3,7 @@
========================
.. this is a revision shortly after release-2.6.1
-.. startrev: 07769be4057b
+.. startrev: 3a8f5481dab4
.. branch: keys_with_hash
Improve the performance of dict.update() and a bunch of methods from
@@ -85,3 +85,10 @@
.. branch: vecopt-merge
A new optimization pass to use emit vectorized loops
+
+.. branch: ppc-updated-backend
+
+The PowerPC JIT backend is merged.
+
+.. branch: osx-libffi
+
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -1,12 +1,8 @@
=========================
-What's new in PyPy 15.11+
+What's new in PyPy 4.0.+
=========================
-.. this is a revision shortly after release-15.11.0
-.. startrev: d924723d483b
+.. this is a revision shortly after release-4.0.0
+.. startrev: 3a8f5481dab4
-.. branch: ppc-updated-backend
-The PowerPC JIT backend is merged.
-
-.. branch: osx-libffi
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
