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

Author: Armin Rigo Branch: release-1.2 Changeset: r2252:0cf51149cdd8 Date: 2015-08-20 23:10 +0200 http://bitbucket.org/cffi/cffi/changeset/0cf51149cdd8/ Log:hg merge default diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c --- a/c/_cffi_backend.c +++ b/c/_cffi_backend.c @@ -6298,7 +6298,7

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

Author: Armin Rigo Branch: release-1.2 Changeset: r2244:6756ac8de92f Date: 2015-08-19 15:27 +0200 http://bitbucket.org/cffi/cffi/changeset/6756ac8de92f/ Log:hg merge default diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c --- a/c/_cffi_backend.c +++ b/c/_cffi_backend.c @@ -53,7 +53,7 @@