]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4e335b 755640b)
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Thu, 30 Apr 2015 21:38:14 +0000 (17:38 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 30 Apr 2015 21:38:14 +0000 (17:38 -0400)
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.