Author: Armin Rigo
Branch: cffi-static-callback-embedding
Changeset: r81560:6b1fefba1c93
Date: 2016-01-04 19:57 +0100
http://bitbucket.org/pypy/pypy/changeset/6b1fefba1c93/
Log:hg merge ec-keepalive
diff --git a/rpython/rlib/entrypoint.py b/rpython/rlib/entrypoint.py
--- a/rpython/rlib/entry
Author: Armin Rigo
Branch: cffi-static-callback-embedding
Changeset: r81552:a7b258839a6c
Date: 2016-01-04 16:33 +
http://bitbucket.org/pypy/pypy/changeset/a7b258839a6c/
Log:hg merge ec-keepalive
diff --git a/pypy/module/thread/threadlocals.py
b/pypy/module/thread/threadlocals.py
--- a/p
Author: Armin Rigo
Branch: cffi-static-callback-embedding
Changeset: r81548:f1f0ea2d424c
Date: 2016-01-04 16:54 +0100
http://bitbucket.org/pypy/pypy/changeset/f1f0ea2d424c/
Log:hg merge ec-keepalive
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -28,7 +28,7 @@
DEALINGS IN
Author: Armin Rigo
Branch: cffi-static-callback-embedding
Changeset: r81546:cd096cdf82e1
Date: 2016-01-04 16:52 +0100
http://bitbucket.org/pypy/pypy/changeset/cd096cdf82e1/
Log:hg merge ec-keepalive
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-
