Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r75476:28167a7092ca
Date: 2015-01-22 10:04 +0100
http://bitbucket.org/pypy/pypy/changeset/28167a7092ca/

Log:    add merged branches

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
@@ -130,3 +130,6 @@
 mmap(), called rarely during major GCs, if such a major GC occurs at
 exactly the wrong time), and some of the less rare kind
 (particularly on Windows tests).
+
+.. branch: osx-package.py
+.. branch: package.py-helpful-error-message
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to