[pypy-commit] pypy dynamic-specialized-tuple: merged default in

2012-04-24 Thread alex_gaynor
Author: Alex Gaynor Branch: dynamic-specialized-tuple Changeset: r54731:4f3c2643ce7a Date: 2012-04-24 13:42 -0400 http://bitbucket.org/pypy/pypy/changeset/4f3c2643ce7a/ Log:merged default in diff --git a/pypy/jit/metainterp/heapcache.py b/pypy/jit/metainterp/heapcache.py --- a/pypy/jit/metai

[pypy-commit] pypy dynamic-specialized-tuple: merged default in, resolved merge conflicts

2012-03-13 Thread alex_gaynor
Author: Alex Gaynor Branch: dynamic-specialized-tuple Changeset: r53460:2e5657b28f97 Date: 2012-03-13 11:33 -0700 http://bitbucket.org/pypy/pypy/changeset/2e5657b28f97/ Log:merged default in, resolved merge conflicts diff --git a/pypy/annotation/builtin.py b/pypy/annotation/builtin.py --- a/