[pypy-commit] pypy gc-hooks: hg merge default

2018-04-16 Thread antocuni
Author: Antonio Cuni Branch: gc-hooks Changeset: r94350:8711cbc8d281 Date: 2018-04-16 12:36 + http://bitbucket.org/pypy/pypy/changeset/8711cbc8d281/ Log:hg merge default diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst --- a/pypy/doc/how-to-release.rst +++ b/pypy/do

[pypy-commit] pypy gc-hooks: hg merge default

2018-04-12 Thread antocuni
Author: Antonio Cuni Branch: gc-hooks Changeset: r94312:f157561218b4 Date: 2018-04-12 18:03 +0200 http://bitbucket.org/pypy/pypy/changeset/f157561218b4/ Log:hg merge default diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -6,36 +6,36 @@ Except when otherwise stated (look for L

[pypy-commit] pypy gc-hooks: hg merge default

2018-04-05 Thread antocuni
Author: Antonio Cuni Branch: gc-hooks Changeset: r94243:00c8c55ee465 Date: 2018-04-05 09:37 +0100 http://bitbucket.org/pypy/pypy/changeset/00c8c55ee465/ Log:hg merge default diff --git a/lib-python/2.7/re.py b/lib-python/2.7/re.py --- a/lib-python/2.7/re.py +++ b/lib-python/2.7/re.py @@ -225

[pypy-commit] pypy gc-hooks: hg merge default

2018-03-30 Thread antocuni
Author: Antonio Cuni Branch: gc-hooks Changeset: r94191:9edf064fc152 Date: 2018-03-30 18:31 +0200 http://bitbucket.org/pypy/pypy/changeset/9edf064fc152/ Log:hg merge default diff too long, truncating to 2000 out of 2274 lines diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.