Author: Carl Friedrich Bolz
Branch: optresult
Changeset: r78184:f191fe52a258
Date: 2015-06-18 17:26 +0200
http://bitbucket.org/pypy/pypy/changeset/f191fe52a258/
Log:merge default
diff too long, truncating to 2000 out of 73369 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
Author: Maciej Fijalkowski
Branch: optresult
Changeset: r76161:49b01bee468c
Date: 2015-02-27 14:15 +0200
http://bitbucket.org/pypy/pypy/changeset/49b01bee468c/
Log:merge default
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -36,7 +36,7 @@
Author: Maciej Fijalkowski
Branch: optresult
Changeset: r75187:7bdcf543fd1c
Date: 2014-12-31 09:42 +0200
http://bitbucket.org/pypy/pypy/changeset/7bdcf543fd1c/
Log:merge default (badly)
diff too long, truncating to 2000 out of 5605 lines
diff --git a/lib-python/2.7/test/test_xml_etree.py
b
Author: Maciej Fijalkowski
Branch: optresult
Changeset: r74991:8e03e2425205
Date: 2014-12-17 19:32 +0200
http://bitbucket.org/pypy/pypy/changeset/8e03e2425205/
Log:merge default
diff too long, truncating to 2000 out of 2146 lines
diff --git a/lib-python/2.7/test/test_collections.py
b/lib-p
Author: Maciej Fijalkowski
Branch: optresult
Changeset: r74903:30f34cca91d4
Date: 2014-12-12 18:43 +0200
http://bitbucket.org/pypy/pypy/changeset/30f34cca91d4/
Log:merge default
diff too long, truncating to 2000 out of 14889 lines
diff --git a/lib-python/2.7/sqlite3/test/dbapi.py
b/lib-pyt
Author: Maciej Fijalkowski
Branch: optresult
Changeset: r74504:25a2e8817653
Date: 2014-11-13 15:22 +0200
http://bitbucket.org/pypy/pypy/changeset/25a2e8817653/
Log:merge default
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/_ctypes_test.c
b/pypy/module/test_lib_pypy/ctypes_tests/_ctyp
