]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca8aa4a 4e12ad1)
Issue 15985: merge from 3.2.
authorMark Dickinson <mdickinson@enthought.com>
Thu, 20 Sep 2012 19:51:53 +0000 (20:51 +0100)
committerMark Dickinson <mdickinson@enthought.com>
Thu, 20 Sep 2012 19:51:53 +0000 (20:51 +0100)
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.