[pypy-commit] cffi static-callback: hg merge default

2015-11-23 Thread arigo
Author: Armin Rigo Branch: static-callback Changeset: r2426:b5b5fb2182e7 Date: 2015-11-23 16:11 +0100 http://bitbucket.org/cffi/cffi/changeset/b5b5fb2182e7/ 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 @@ -103,7 +103,

[pypy-commit] cffi static-callback: hg merge default

2015-11-16 Thread arigo
Author: Armin Rigo Branch: static-callback Changeset: r2408:bbc42a0625ee Date: 2015-11-16 12:26 +0100 http://bitbucket.org/cffi/cffi/changeset/bbc42a0625ee/ Log:hg merge default diff --git a/testing/cffi1/test_commontypes.py b/testing/cffi1/test_commontypes.py --- a/testing/cffi1/test_commo

[pypy-commit] cffi static-callback: hg merge default

2015-11-15 Thread arigo
Author: Armin Rigo Branch: static-callback Changeset: r2400:b3f8361175b7 Date: 2015-11-15 09:22 +0100 http://bitbucket.org/cffi/cffi/changeset/b3f8361175b7/ 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 @@ -6495,7 +649