Author: mattip <matti.pi...@gmail.com> Branch: Changeset: r79142:07769be4057b Date: 2015-08-22 20:27 +0300 http://bitbucket.org/pypy/pypy/changeset/07769be4057b/
Log: document merged branch diff --git a/pypy/doc/whatsnew-2.6.1.rst b/pypy/doc/whatsnew-2.6.1.rst --- a/pypy/doc/whatsnew-2.6.1.rst +++ b/pypy/doc/whatsnew-2.6.1.rst @@ -3,7 +3,7 @@ ======================== .. this is a revision shortly after release-2.6.0 -.. startrev: 91904d5c5188 +.. startrev: 3332c09a0ad8 .. branch: use_min_scalar Correctly resolve the output dtype of ufunc(array, scalar) calls. @@ -70,3 +70,7 @@ .. branch: vmprof-review Clean up of vmprof, notably to handle correctly multiple threads + +.. branch: no_boehm_dl + +Remove extra link library from Boehm GC 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-2.6.1 -.. startrev: 83ebc73d4fcb +.. startrev: 3332c09a0ad8 _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
