]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b65ff1d eb7e8f6)
merge with 3.4
authorGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 11:54:43 +0000 (13:54 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 11:54:43 +0000 (13:54 +0200)
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.