summaryrefslogtreecommitdiff
path: root/Lib/pydoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-01 21:58:18 +0000
committerGeorg Brandl <georg@python.org>2010-08-01 21:58:18 +0000
commit86edb140570f0e1761e6444d78d2a027d58dd240 (patch)
treece32016c0fd213fdce51458bb47547c59ea2f462 /Lib/pydoc.py
parent6290bcfc2552b03a4d36ffd773d152d0cfb8a571 (diff)
downloadcpython-git-86edb140570f0e1761e6444d78d2a027d58dd240.tar.gz
Merged revisions 83461 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83461 | georg.brandl | 2010-08-01 23:18:52 +0200 (So, 01 Aug 2010) | 9 lines Merged revisions 83201 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83201 | georg.brandl | 2010-07-28 10:19:35 +0200 (Mi, 28 Jul 2010) | 1 line #9354: Provide getsockopt() in asyncore file_wrapper(). Patch by Lukas Langa. ........ ................
Diffstat (limited to 'Lib/pydoc.py')
0 files changed, 0 insertions, 0 deletions