[pypy-commit] pypy release-2.6.x: merge default into branch

Author: mattip Branch: release-2.6.x Changeset: r79235:225756b155a3 Date: 2015-08-26 23:52 +0300 http://bitbucket.org/pypy/pypy/changeset/225756b155a3/ Log:merge default into branch diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -353,8 +353,7 @@ Except when otherwise stated (

[pypy-commit] pypy release-2.6.x: merge default into branch

Author: mattip Branch: release-2.6.x Changeset: r79069:d72d3d9ffb97 Date: 2015-08-19 18:11 +0300 http://bitbucket.org/pypy/pypy/changeset/d72d3d9ffb97/ Log:merge default into branch diff too long, truncating to 2000 out of 31450 lines diff --git a/_pytest/assertion/rewrite.py b/_pytest/asse

[pypy-commit] pypy release-2.6.x: merge default into branch

Author: mattip Branch: release-2.6.x Changeset: r77485:4ec30a1b7b67 Date: 2015-05-22 12:25 +0300 http://bitbucket.org/pypy/pypy/changeset/4ec30a1b7b67/ Log:merge default into branch diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-2.6.0.rst copy from pypy/doc/whatsnew-head.rst cop