[pypy-commit] pypy default: document merged branches

[mattip]

Author: mattip <matti.picus at gmail.com>
Branch: 
Changeset: r80799:9360f3b2ba81
Date: 2015-11-20 16:19 +0200
http://bitbucket.org/pypy/pypy/changeset/9360f3b2ba81/

Log:	document 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
@@ -5,3 +5,11 @@
 .. this is a revision shortly after release-4.0.1
 .. startrev: 4b5c840d0da2
 
+.. branch: numpy-1.10
+
+Fix tests to run cleanly with -A and start to fix micronumpy for upstream numpy
+which is now 1.10.2
+
+.. branch: osx-flat-namespace
+
+Fix the cpyext tests on OSX by linking with -flat_namespace