]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6e9f47 b9869df)
merge 3.4 (#17167)
authorBenjamin Peterson <benjamin@python.org>
Tue, 22 Mar 2016 05:31:24 +0000 (22:31 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 22 Mar 2016 05:31:24 +0000 (22:31 -0700)
1  2 
Misc/python.man patch | diff1 | diff2 | blob | history

diff --cc Misc/python.man
Simple merge
Unnamed repository; edit this file 'description' to name the repository.