[pypy-commit] cffi default: hg merge release-1.4

2015-12-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r2494:f65126989772 Date: 2015-12-21 19:12 +0100 http://bitbucket.org/cffi/cffi/changeset/f65126989772/ Log:hg merge release-1.4 diff --git a/doc/source/installation.rst b/doc/source/installation.rst --- a/doc/source/installation.rst +++ b/doc/source/ins

[pypy-commit] cffi default: hg merge release-1.4

2015-12-17 Thread arigo
Author: Armin Rigo Branch: Changeset: r2490:3c9573e3475c Date: 2015-12-17 16:40 +0100 http://bitbucket.org/cffi/cffi/changeset/3c9573e3475c/ Log:hg merge release-1.4 diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c --- a/c/_cffi_backend.c +++ b/c/_cffi_backend.c @@ -6498,7 +6498,7 @@

[pypy-commit] cffi default: hg merge release-1.4

2015-12-17 Thread arigo
Author: Armin Rigo Branch: Changeset: r2484:0289deec3d92 Date: 2015-12-17 15:29 +0100 http://bitbucket.org/cffi/cffi/changeset/0289deec3d92/ Log:hg merge release-1.4 diff --git a/doc/source/installation.rst b/doc/source/installation.rst --- a/doc/source/installation.rst +++ b/doc/source/ins