]> 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: 8567493 388c945)
#12725: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 14 Aug 2011 05:29:49 +0000 (08:29 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 14 Aug 2011 05:29:49 +0000 (08:29 +0300)
1  2 
Doc/ACKS.txt patch | diff1 | diff2 | blob | history
Doc/library/socket.rst patch | diff1 | diff2 | blob | history
Modules/socketmodule.c patch | diff1 | diff2 | blob | history

diff --cc Doc/ACKS.txt
Simple merge
diff --cc Doc/library/socket.rst
Simple merge
diff --cc Modules/socketmodule.c
Simple merge
Mirror of https://github.com/python/cpython.git