summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-03-31 16:46:45 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-03-31 16:46:45 (GMT)
commit6eeadf0a3efd964837e0a274bf202442facdb617 (patch)
tree8569c10df4eb85bf9c6b542563876fdc2c073232
parent3510632ad39783b12bbd666e3ed73ff0bf07d8e4 (diff)
parent29e665dbdaf1d543e503e866345d54d7d973d150 (diff)
downloadcpython-6eeadf0a3efd964837e0a274bf202442facdb617.zip
cpython-6eeadf0a3efd964837e0a274bf202442facdb617.tar.gz
cpython-6eeadf0a3efd964837e0a274bf202442facdb617.tar.bz2
merge heads
-rw-r--r--Misc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 9095045..5c93c0a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,7 +37,7 @@ Core and Builtins
Library
-------
-- Issue #5136: deprecated old, unused functions from tkinter.
+- Issue #5136: deprecate old, unused functions from tkinter.
- Issue #14409: IDLE now properly executes commands in the Shell window
when it cannot read the normal config files on startup and