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

2019-04-18 Thread arigo
Author: Armin Rigo Branch: release-1.12 Changeset: r3263:553702112a56 Date: 2019-04-18 13:11 +0200 http://bitbucket.org/cffi/cffi/changeset/553702112a56/ Log:hg merge default diff too long, truncating to 2000 out of 2146 lines diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c --- a/c/_cffi

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

2019-02-26 Thread arigo
Author: Armin Rigo Branch: release-1.12 Changeset: r3233:2c4239852fde Date: 2019-02-26 16:00 +0100 http://bitbucket.org/cffi/cffi/changeset/2c4239852fde/ 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 @@ -2,7 +2,7 @@ #

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

2019-02-16 Thread arigo
Author: Armin Rigo Branch: release-1.12 Changeset: r3221:f70fc47c1871 Date: 2019-02-16 14:19 +0100 http://bitbucket.org/cffi/cffi/changeset/f70fc47c1871/ Log:hg merge default diff --git a/cffi/_cffi_include.h b/cffi/_cffi_include.h --- a/cffi/_cffi_include.h +++ b/cffi/_cffi_include.h @@ -8,

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

2019-02-13 Thread arigo
Author: Armin Rigo Branch: release-1.12 Changeset: r3214:648850aaf0ee Date: 2019-02-13 12:56 +0100 http://bitbucket.org/cffi/cffi/changeset/648850aaf0ee/ Log:hg merge default diff --git a/testing/embedding/test_thread.py b/testing/embedding/test_thread.py --- a/testing/embedding/test_thread.