[pypy-commit] cffi cmacros: hg merge default

Author: Armin Rigo Branch: cmacros Changeset: r2234:55774b4c3293 Date: 2015-07-30 16:50 +0200 http://bitbucket.org/cffi/cffi/changeset/55774b4c3293/ Log:hg merge default diff --git a/cffi/cparser.py b/cffi/cparser.py --- a/cffi/cparser.py +++ b/cffi/cparser.py @@ -15,7 +15,8 @@ except Impor

[pypy-commit] cffi cmacros: hg merge default

Author: Armin Rigo Branch: cmacros Changeset: r2235:e40456e91447 Date: 2015-07-30 17:06 +0200 http://bitbucket.org/cffi/cffi/changeset/e40456e91447/ Log:hg merge default diff --git a/cffi/cparser.py b/cffi/cparser.py --- a/cffi/cparser.py +++ b/cffi/cparser.py @@ -17,8 +17,9 @@ _r_comment