Author: mattip <matti.pi...@gmail.com> Branch: release-5.x Changeset: r83646:abc514a1cfa1 Date: 2016-04-12 23:22 +0300 http://bitbucket.org/pypy/pypy/changeset/abc514a1cfa1/
Log: merge default into branch diff --git a/pypy/doc/whatsnew-5.1.0.rst b/pypy/doc/whatsnew-5.1.0.rst --- a/pypy/doc/whatsnew-5.1.0.rst +++ b/pypy/doc/whatsnew-5.1.0.rst @@ -54,3 +54,9 @@ annoying special-purpose code for pinned pointers. .. branch: fix-jitlog + +.. branch: cleanup-includes + +Remove old uneeded numpy headers, what is left is only for testing. Also +generate pypy_numpy.h which exposes functions to directly use micronumpy +ndarray and ufuncs 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 @@ -3,5 +3,5 @@ ========================= .. this is a revision shortly after release-5.1 -.. startrev: fb4f0a20239b +.. startrev: 2180e1eaf6f6 _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit