summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2013-11-12 04:30:47 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2013-11-12 04:30:47 (GMT)
commit0eac43a4eb723954cf50829fa31536cd35d1f60b (patch)
treea0c1e91e226a3afad2c9fbe41b8b2768cc4aa886 /Misc
parentacea823fd876893400735985904904e9a63d43d9 (diff)
downloadcpython-0eac43a4eb723954cf50829fa31536cd35d1f60b.zip
cpython-0eac43a4eb723954cf50829fa31536cd35d1f60b.tar.gz
cpython-0eac43a4eb723954cf50829fa31536cd35d1f60b.tar.bz2
Correct a merge error in Misc/NEWS
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index d84fc45..9abddbb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,10 +29,10 @@ Library
- Issue #6157: Fixed tkinter.Text.debug(). Original patch by Guilherme Polo.
- Issue #6160: The bbox() method of tkinter.Spinbox now returns a tuple of
+ integers instead of a string. Based on patch by Guilherme Polo.
- Issue #10197: Rework subprocess.get[status]output to use subprocess
functionality and thus to work on Windows. Patch by Nick Coghlan.
- integers instead of a string. Based on patch by Guilherme Polo.
- Issue #19286: Directories in ``package_data`` are no longer added to
the filelist, preventing failure outlined in the ticket.