[pypy-commit] pypy online-transforms: hg merge default

2014-11-08 Thread rlamy
Author: Ronan Lamy Branch: online-transforms Changeset: r74414:0ba2b288f039 Date: 2014-11-09 00:22 + http://bitbucket.org/pypy/pypy/changeset/0ba2b288f039/ Log:hg merge default diff --git a/pypy/module/cpyext/include/modsupport.h b/pypy/module/cpyext/include/modsupport.h --- a/pypy/modu

[pypy-commit] pypy online-transforms: hg merge default

2014-11-06 Thread rlamy
Author: Ronan Lamy Branch: online-transforms Changeset: r74355:b4bdf3e9a6b6 Date: 2014-11-06 16:41 + http://bitbucket.org/pypy/pypy/changeset/b4bdf3e9a6b6/ Log:hg merge default diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -37,4 +37,4 @@ to use virtualenv wit

[pypy-commit] pypy online-transforms: hg merge default

2014-11-02 Thread rlamy
Author: Ronan Lamy Branch: online-transforms Changeset: r74327:d935b9812077 Date: 2014-11-01 05:16 + http://bitbucket.org/pypy/pypy/changeset/d935b9812077/ Log:hg merge default diff too long, truncating to 2000 out of 4803 lines diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyo

[pypy-commit] pypy online-transforms: hg merge default

2014-10-29 Thread rlamy
Author: Ronan Lamy Branch: online-transforms Changeset: r74275:16b400a3b68d Date: 2014-10-29 17:30 + http://bitbucket.org/pypy/pypy/changeset/16b400a3b68d/ Log:hg merge default diff too long, truncating to 2000 out of 36241 lines diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/

[pypy-commit] pypy online-transforms: hg merge default

2014-10-16 Thread rlamy
Author: Ronan Lamy Branch: online-transforms Changeset: r73978:1bdebe826b62 Date: 2014-10-16 16:46 +0100 http://bitbucket.org/pypy/pypy/changeset/1bdebe826b62/ Log:hg merge default diff --git a/rpython/annotator/annrpython.py b/rpython/annotator/annrpython.py --- a/rpython/annotator/annrpyth