]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f5b6d7 9ecb6be)
#13695: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 16 Jan 2012 06:29:42 +0000 (08:29 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 16 Jan 2012 06:29:42 +0000 (08:29 +0200)
1  2 
Doc/library/functools.rst patch | diff1 | diff2 | blob | history
Doc/library/unittest.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/functools.rst
Simple merge
diff --cc Doc/library/unittest.rst
Simple merge
Mirror of https://github.com/python/cpython.git