Author: Richard Plangger
Branch: vmprof-native
Changeset: r90790:dd7413118eca
Date: 2017-03-22 11:45 -0300
http://bitbucket.org/pypy/pypy/changeset/dd7413118eca/
Log:merge default
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -80,5 +80,6 @@
.hypothesis/
^release/
^
Author: Richard Plangger
Branch: vmprof-native
Changeset: r90724:4a1cac3da487
Date: 2017-03-16 10:19 +0100
http://bitbucket.org/pypy/pypy/changeset/4a1cac3da487/
Log:merge default
diff too long, truncating to 2000 out of 2513 lines
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
Author: Richard Plangger
Branch: vmprof-native
Changeset: r90696:107955f416ca
Date: 2017-03-14 14:30 +0100
http://bitbucket.org/pypy/pypy/changeset/107955f416ca/
Log:merge default
diff too long, truncating to 2000 out of 37236 lines
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.
Author: Richard Plangger
Branch: vmprof-native
Changeset: r90024:1ae8adccedfb
Date: 2017-02-09 14:53 +0100
http://bitbucket.org/pypy/pypy/changeset/1ae8adccedfb/
Log:merge default
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@