]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f69f02 047ada4)
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Fri, 27 May 2016 05:56:51 +0000 (22:56 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 27 May 2016 05:56:51 +0000 (22:56 -0700)
1  2 
Doc/faq/programming.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/faq/programming.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.