]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a0b9a4 86fdbf3)
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Thu, 19 Mar 2015 02:36:23 +0000 (21:36 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 19 Mar 2015 02:36:23 +0000 (21:36 -0500)
1  2 
Lib/_pyio.py patch | diff1 | diff2 | blob | history

diff --cc Lib/_pyio.py
Simple merge
Mirror of https://github.com/python/cpython.git