Author: Armin Rigo
Branch: guard-compatible
Changeset: r90007:e0be031fa6c2
Date: 2017-02-08 11:12 +0100
http://bitbucket.org/pypy/pypy/changeset/e0be031fa6c2/
Log:fix merge
diff --git a/rpython/rlib/test/test_jit.py b/rpython/rlib/test/test_jit.py
--- a/rpython/rlib/test/test_jit.py
+++ b/rp
Author: Carl Friedrich Bolz
Branch: guard-compatible
Changeset: r85136:de092081d81f
Date: 2016-06-13 16:42 +0200
http://bitbucket.org/pypy/pypy/changeset/de092081d81f/
Log:fix merge
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobj
