]> 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: 48df37d 6d3ad2f)
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Fri, 27 May 2016 05:51:44 +0000 (22:51 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 27 May 2016 05:51:44 +0000 (22:51 -0700)
1  2 
Doc/faq/programming.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/faq/programming.rst
Simple merge
Mirror of https://github.com/python/cpython.git