Author: Amaury Forgeot d'Arc
Branch: py3.3
Changeset: r75167:c4e17f979ee1
Date: 2014-12-30 17:21 +0100
http://bitbucket.org/pypy/pypy/changeset/c4e17f979ee1/
Log:hg merge heads
diff too long, truncating to 2000 out of 15310 lines
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/R
Author: Amaury Forgeot d'Arc
Branch: py3.3
Changeset: r74928:362d1c6f3870
Date: 2014-12-14 19:41 +0100
http://bitbucket.org/pypy/pypy/changeset/362d1c6f3870/
Log:hg merge heads
diff too long, truncating to 2000 out of 4604 lines
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoptio
Author: Amaury Forgeot d'Arc
Branch: py3.3
Changeset: r74206:7b2bd81a69d5
Date: 2014-10-25 11:46 +0200
http://bitbucket.org/pypy/pypy/changeset/7b2bd81a69d5/
Log:hg merge heads
diff too long, truncating to 2000 out of 5280 lines
diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.
