Author: Richard Plangger
Branch:
Changeset: r91110:dd0dc2131308
Date: 2017-04-21 07:51 -0400
http://bitbucket.org/pypy/pypy/changeset/dd0dc2131308/
Log:merge vmprof-0.4.4
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -49,6 +49,11 @@
^rpython/translator/goal/target.+
Author: Richard Plangger
Branch:
Changeset: r9:00d6de106be5
Date: 2017-04-21 07:52 -0400
http://bitbucket.org/pypy/pypy/changeset/00d6de106be5/
Log:document branch
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsn
Author: Matti Picus
Branch: py3.5
Changeset: r91112:8a8a6257682e
Date: 2017-04-21 15:52 +0300
http://bitbucket.org/pypy/pypy/changeset/8a8a6257682e/
Log:update external win32 libraries, adjust cffi build scripts
diff --git a/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
b/lib_pypy/_cffi
Author: Matti Picus
Branch:
Changeset: r91113:01f4f2927769
Date: 2017-04-21 16:03 +0300
http://bitbucket.org/pypy/pypy/changeset/01f4f2927769/
Log:update for newer external win32 libraries
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/win
Author: Matti Picus
Branch:
Changeset: r91114:2d815768f073
Date: 2017-04-21 17:35 +0300
http://bitbucket.org/pypy/pypy/changeset/2d815768f073/
Log:update for newer zip
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -120,7 +1