]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc4b438 741c45a)
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Mon, 16 Jan 2017 08:05:54 +0000 (00:05 -0800)
committerBenjamin Peterson <benjamin@python.org>
Mon, 16 Jan 2017 08:05:54 +0000 (00:05 -0800)
1  2 
Modules/makesetup patch | diff1 | diff2 | blob | history

diff --cc Modules/makesetup
Simple merge
Unnamed repository; edit this file 'description' to name the repository.