Author: Mark Young
Branch: py3k
Changeset: r86468:159ee4a5dd97
Date: 2016-08-23 17:46 -0400
http://bitbucket.org/pypy/pypy/changeset/159ee4a5dd97/
Log:Merging with upstream 3k
diff too long, truncating to 2000 out of 35449 lines
diff --git a/dotviewer/graphparse.py b/dotviewer/graphparse.py
Author: Mark Young
Branch: py3k
Changeset: r85283:3509fa74996d
Date: 2016-06-03 01:00 -0400
http://bitbucket.org/pypy/pypy/changeset/3509fa74996d/
Log:Merging with upstream.
diff too long, truncating to 2000 out of 5949 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -23
Author: Mark Young
Branch: py3k
Changeset: r85280:853abe86c4e9
Date: 2016-05-30 12:46 -0400
http://bitbucket.org/pypy/pypy/changeset/853abe86c4e9/
Log:Merging with upstream.
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rs