[pypy-commit] cffi cffi-1.0: merge heads

2015-05-11 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: cffi-1.0 Changeset: r1974:56fc30b8d7e1 Date: 2015-05-11 15:59 +0200 http://bitbucket.org/cffi/cffi/changeset/56fc30b8d7e1/ Log:merge heads diff --git a/TODO b/TODO --- a/TODO +++ b/TODO @@ -13,3 +13,6 @@ * mention todo: ffi.new(xyz) makes {xyz:

[pypy-commit] cffi cffi-1.0: merge heads

2015-05-09 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: cffi-1.0 Changeset: r1942:23a206da071b Date: 2015-05-09 12:01 +0200 http://bitbucket.org/cffi/cffi/changeset/23a206da071b/ Log:merge heads diff --git a/_cffi1/test_cffi_binary.py b/_cffi1/test_cffi_binary.py --- a/_cffi1/test_cffi_binary.py +++

[pypy-commit] cffi cffi-1.0: merge heads

2015-04-27 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: cffi-1.0 Changeset: r1867:292cb69ac76c Date: 2015-04-27 23:49 +0200 http://bitbucket.org/cffi/cffi/changeset/292cb69ac76c/ Log:merge heads diff --git a/_cffi1/lib_obj.c b/_cffi1/lib_obj.c --- a/_cffi1/lib_obj.c +++ b/_cffi1/lib_obj.c @@ -231,8

[pypy-commit] cffi cffi-1.0: merge heads

2013-03-08 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: cffi-1.0 Changeset: r1195:2c7a859bc43a Date: 2013-03-08 13:56 +0100 http://bitbucket.org/cffi/cffi/changeset/2c7a859bc43a/ Log:merge heads diff --git a/cffi/api.py b/cffi/api.py --- a/cffi/api.py +++ b/cffi/api.py @@ -1,4 +1,4 @@ -import types