summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-07-12 21:11:03 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-07-12 21:11:03 (GMT)
commit91b3d8d54724a8fd816b900f6156e0ad45867cf8 (patch)
tree98a58e9392474e097d58559f3e6fd66dee3b2d7c /Lib
parentad0eacee18a4862f76f873ecbd4ef1f4ec11f9ac (diff)
downloadcpython-91b3d8d54724a8fd816b900f6156e0ad45867cf8.zip
cpython-91b3d8d54724a8fd816b900f6156e0ad45867cf8.tar.gz
cpython-91b3d8d54724a8fd816b900f6156e0ad45867cf8.tar.bz2
These revisions were merged manaually:
Blocked revisions 64062,64068-64069,64080 via svnmerge ........ r64062 | josiah.carlson | 2008-06-10 00:00:08 -0500 (Tue, 10 Jun 2008) | 5 lines Applying updated patch from Issue 1736190, which addresses partial issues in: 909005 and 17361001, as well as completely as possible issues 539444, 760475, 777588, 889153, 953599, 1025525, 1063924, and 658749. This patch also includes doc and test updates as necessary. ........ r64068 | benjamin.peterson | 2008-06-10 08:37:13 -0500 (Tue, 10 Jun 2008) | 2 lines fix markup ........ r64069 | georg.brandl | 2008-06-10 08:53:24 -0500 (Tue, 10 Jun 2008) | 2 lines more markup fix. ........ r64080 | josiah.carlson | 2008-06-10 10:58:19 -0500 (Tue, 10 Jun 2008) | 3 lines Fixed test to reflect new filedispatcher semantics, as well as two NameErrors pointed out by Giampaolo. ........
Diffstat (limited to 'Lib')
0 files changed, 0 insertions, 0 deletions