Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r88434:3dc381df7878
Date: 2016-11-17 14:18 +0100
http://bitbucket.org/pypy/pypy/changeset/3dc381df7878/

Log:    merge heads

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
@@ -15,6 +15,8 @@
 
 Try to improve the consistency of RPython annotation unions.
 
+.. branch: pytest-2.9.2
+
 .. branch: clean-exported-state
 
 Clean-ups in the jit optimizeopt
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to