[pypy-commit] pypy default: hg merge heads

2017-06-05 Thread arigo
Author: Armin Rigo Branch: Changeset: r91522:0649d557369f Date: 2017-06-05 11:43 +0200 http://bitbucket.org/pypy/pypy/changeset/0649d557369f/ Log:hg merge heads diff --git a/lib-python/2.7/warnings.py b/lib-python/2.7/warnings.py --- a/lib-python/2.7/warnings.py +++ b/lib-python/2.7/warning

[pypy-commit] pypy default: hg merge heads

2016-02-15 Thread arigo
Author: Armin Rigo Branch: Changeset: r82251:7ab8c02fe793 Date: 2016-02-15 10:19 +0100 http://bitbucket.org/pypy/pypy/changeset/7ab8c02fe793/ Log:hg merge heads diff --git a/lib_pypy/cffi.egg-info/PKG-INFO b/lib_pypy/cffi.egg-info/PKG-INFO --- a/lib_pypy/cffi.egg-info/PKG-INFO +++ b/lib_pyp

[pypy-commit] pypy default: hg merge heads

2012-11-05 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: Changeset: r58750:46d142d32515 Date: 2012-11-05 21:33 +0100 http://bitbucket.org/pypy/pypy/changeset/46d142d32515/ Log:hg merge heads diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py --- a/pypy/objspace/std/bytear