[pypy-commit] pypy release-1.6.x: merge heads

Author: Armin Rigo Branch: release-1.6.x Changeset: r46499:dbeb9dd992ab Date: 2011-08-14 17:31 + http://bitbucket.org/pypy/pypy/changeset/dbeb9dd992ab/ Log:merge heads diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py --- a/lib_pypy/_sqlite3.py +++ b/lib_pypy/_sqlite3.py @@ -891,7

[pypy-commit] pypy release-1.6.x: merge heads

Author: Armin Rigo Branch: release-1.6.x Changeset: r46467:dcae7aed462b Date: 2011-08-12 12:00 +0200 http://bitbucket.org/pypy/pypy/changeset/dcae7aed462b/ Log:merge heads diff --git a/pypy/module/micronumpy/interp_numarray.py b/pypy/module/micronumpy/interp_numarray.py --- a/pypy/module/mi