[pypy-commit] pypy follow_symlinks: hg merge py3k

2016-04-19 Thread rlamy
Author: Ronan Lamy Branch: follow_symlinks Changeset: r83775:16fdc05dd0b4 Date: 2016-04-19 20:12 +0100 http://bitbucket.org/pypy/pypy/changeset/16fdc05dd0b4/ Log:hg merge py3k diff too long, truncating to 2000 out of 8726 lines diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -

[pypy-commit] pypy follow_symlinks: hg merge py3k

2016-04-06 Thread rlamy
Author: Ronan Lamy Branch: follow_symlinks Changeset: r83547:f19923c93568 Date: 2016-04-06 17:21 +0100 http://bitbucket.org/pypy/pypy/changeset/f19923c93568/ Log:hg merge py3k diff too long, truncating to 2000 out of 10581 lines diff --git a/lib_pypy/_ctypes/structure.py b/lib_pypy/_ctypes/