]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7b2aa5 1895f2b)
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 1 Oct 2014 19:39:05 +0000 (15:39 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 1 Oct 2014 19:39:05 +0000 (15:39 -0400)
1  2 
Doc/library/functions.rst patch | diff1 | diff2 | blob | history

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