[pypy-commit] pypy stm-thread-2: hg merge default

2013-02-16 Thread arigo
Author: Armin Rigo Branch: stm-thread-2 Changeset: r61327:65ec96e15463 Date: 2013-02-16 17:34 +0100 http://bitbucket.org/pypy/pypy/changeset/65ec96e15463/ Log:hg merge default diff --git a/pypy/interpreter/miscutils.py b/pypy/interpreter/miscutils.py --- a/pypy/interpreter/miscutils.py +++ b

[pypy-commit] pypy stm-thread-2: hg merge default

2013-02-16 Thread arigo
Author: Armin Rigo Branch: stm-thread-2 Changeset: r61317:8eedaf9d0459 Date: 2013-02-16 11:17 +0100 http://bitbucket.org/pypy/pypy/changeset/8eedaf9d0459/ Log:hg merge default diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc

[pypy-commit] pypy stm-thread-2: hg merge default

2013-02-01 Thread arigo
Author: Armin Rigo Branch: stm-thread-2 Changeset: r60810:fe07a7c23088 Date: 2013-02-01 16:29 +0100 http://bitbucket.org/pypy/pypy/changeset/fe07a7c23088/ Log:hg merge default diff --git a/lib-python/2.7/test/test_zipfile.py b/lib-python/2.7/test/test_zipfile.py --- a/lib-python/2.7/test/te

[pypy-commit] pypy stm-thread-2: hg merge default

2013-01-31 Thread arigo
Author: Armin Rigo Branch: stm-thread-2 Changeset: r60788:308102001cb3 Date: 2013-01-31 18:20 +0100 http://bitbucket.org/pypy/pypy/changeset/308102001cb3/ Log:hg merge default diff --git a/lib_pypy/_ctypes_test.py b/lib_pypy/_ctypes_test.py --- a/lib_pypy/_ctypes_test.py +++ b/lib_pypy/_ctyp

[pypy-commit] pypy stm-thread-2: hg merge default

2013-01-31 Thread arigo
Author: Armin Rigo Branch: stm-thread-2 Changeset: r60782:49a1afc2949f Date: 2013-01-31 17:40 +0100 http://bitbucket.org/pypy/pypy/changeset/49a1afc2949f/ Log:hg merge default diff --git a/rpython/rlib/rthread.py b/rpython/rlib/rthread.py --- a/rpython/rlib/rthread.py +++ b/rpython/rlib/rthr

[pypy-commit] pypy stm-thread-2: hg merge default

2013-01-31 Thread arigo
Author: Armin Rigo Branch: stm-thread-2 Changeset: r60772:08fd9ba5355b Date: 2013-01-31 15:04 +0100 http://bitbucket.org/pypy/pypy/changeset/08fd9ba5355b/ Log:hg merge default diff --git a/pypy/doc/discussion/improve-rpython.rst b/pypy/doc/discussion/improve-rpython.rst --- a/pypy/doc/discu

[pypy-commit] pypy stm-thread-2: hg merge default

2013-01-31 Thread arigo
Author: Armin Rigo Branch: stm-thread-2 Changeset: r60770:393048c68eb3 Date: 2013-01-31 14:49 +0100 http://bitbucket.org/pypy/pypy/changeset/393048c68eb3/ Log:hg merge default diff --git a/pypy/interpreter/miscutils.py b/pypy/interpreter/miscutils.py --- a/pypy/interpreter/miscutils.py +++ b

[pypy-commit] pypy stm-thread-2: hg merge default (again)

2013-01-31 Thread arigo
Author: Armin Rigo Branch: stm-thread-2 Changeset: r60766:519029980f3c Date: 2013-01-31 12:47 +0100 http://bitbucket.org/pypy/pypy/changeset/519029980f3c/ Log:hg merge default (again) diff --git a/rpython/rtyper/memory/gc/minimark.py b/rpython/rtyper/memory/gc/minimark.py --- a/rpython/rtyp

[pypy-commit] pypy stm-thread-2: hg merge default

2013-01-05 Thread arigo
Author: Armin Rigo Branch: stm-thread-2 Changeset: r59769:8eae75666f4a Date: 2013-01-05 19:56 +0100 http://bitbucket.org/pypy/pypy/changeset/8eae75666f4a/ Log:hg merge default diff --git a/pypy/jit/metainterp/resume.py b/pypy/jit/metainterp/resume.py --- a/pypy/jit/metainterp/resume.py +++ b