]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77f6411 f056b04)
Merge 3.6
authorXavier de Gaye <xdegaye@users.sourceforge.net>
Sun, 13 Nov 2016 18:42:09 +0000 (19:42 +0100)
committerXavier de Gaye <xdegaye@users.sourceforge.net>
Sun, 13 Nov 2016 18:42:09 +0000 (19:42 +0100)
1  2 
Lib/test/test_socket.py patch | diff1 | diff2 | blob | history

diff --cc Lib/test/test_socket.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.