[pypy-commit] stmgc queue: hg merge default

2015-06-23 Thread arigo
Author: Armin Rigo Branch: queue Changeset: r1866:950c6296eab7 Date: 2015-06-18 18:39 +0100 http://bitbucket.org/pypy/stmgc/changeset/950c6296eab7/ Log:hg merge default diff --git a/c7/gdb/gdb_stm.py b/c7/gdb/gdb_stm.py --- a/c7/gdb/gdb_stm.py +++ b/c7/gdb/gdb_stm.py @@ -34,6 +34,12 @@

[pypy-commit] stmgc queue: hg merge default

2015-06-23 Thread arigo
Author: Armin Rigo Branch: queue Changeset: r1864:0a10e04f2119 Date: 2015-06-18 18:50 +0200 http://bitbucket.org/pypy/stmgc/changeset/0a10e04f2119/ Log:hg merge default diff --git a/c8/stm/core.c b/c8/stm/core.c --- a/c8/stm/core.c +++ b/c8/stm/core.c @@ -495,6 +495,32 @@ static void readd_