summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-09-28 16:07:15 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-09-28 16:07:15 (GMT)
commit3c976a0437a0011fda71e8eac18c1854bd8fdb64 (patch)
treea4d98f627d8e2947fc36197679d7c59fc8725963
parentc6ccd08d613f15485e5a4cb2b2c2fa645fb86f7d (diff)
downloadcpython-3c976a0437a0011fda71e8eac18c1854bd8fdb64.zip
cpython-3c976a0437a0011fda71e8eac18c1854bd8fdb64.tar.gz
cpython-3c976a0437a0011fda71e8eac18c1854bd8fdb64.tar.bz2
Recorded merge of revisions 75054 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r75054 | kristjan.jonsson | 2009-09-25 16:19:51 +0100 (Fri, 25 Sep 2009) | 2 lines http://bugs.python.org/issue6971 Adding the SIO_KEEPALIVE_VALS command to socket.ioctl on windows ........
0 files changed, 0 insertions, 0 deletions