summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2014-12-01 23:17:29 (GMT)
committerBarry Warsaw <barry@python.org>2014-12-01 23:17:29 (GMT)
commit6f3eb39968d08bcb140f34d85d2a803434917bab (patch)
tree71768bb6a1abaa6b172dac1e1ed2f8c11e362db7
parentcfad816e4024cf830c813f7c4faec7b7d3b6bb60 (diff)
parentd4c00d3a5cc82cc53ae655d2c5825eb5d91cd76e (diff)
downloadcpython-6f3eb39968d08bcb140f34d85d2a803434917bab.zip
cpython-6f3eb39968d08bcb140f34d85d2a803434917bab.tar.gz
cpython-6f3eb39968d08bcb140f34d85d2a803434917bab.tar.bz2
Trunk merge.
-rw-r--r--Misc/NEWS3
1 files changed, 0 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index ecd13b9..05e9767 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -403,9 +403,6 @@ Library
- Issue #17442: InteractiveInterpreter now displays the full chained traceback
in its showtraceback method, to match the built in interactive interpreter.
-Tools/Demos
------------
-
- Issue #22314: pydoc now works when the LINES environment variable is set.
- Issue #10510: distutils register and upload methods now use HTML standards