From bb465123c4af18ed2d4c73d06af9cd75d88a9628 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Mon, 5 Feb 2018 01:21:45 -0500 Subject: [PATCH 1/2] Fix merge conflict --- Lib/idlelib/NEWS.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 14d2dddcae2fa9..d82fde26f28ffd 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,7 +1,10 @@ What's New in IDLE 3.6.5 Released on 2017-03-26? -======================== +====================================== + +bpo-32765: Update configdialog General tab create page docstring. +Add new widgets to the widget list. What's New in IDLE 3.6.4 @@ -314,9 +317,9 @@ Issue #28572: Add 10% to coverage of IDLE's test_configdialog. Update and augment description of the configuration system. -What's New in IDLE 3.6.0 +What's New in IDLE 3.6.0 (since 3.5.0) Released on 2016-12-23 -======================== +====================================== - Issue #15308: Add 'interrupt execution' (^C) to Shell menu. Patch by Roger Serwy, updated by Bayard Randel. From 76f7606588b64c3ceace0afd6e6ac2a0ed406cda Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Mon, 5 Feb 2018 01:22:06 -0500 Subject: [PATCH 2/2] [3.6] Add entry for uniform lower context; add 'since' to be explicit. (GH-5539). (cherry picked from commit 05e806767b857b1eab838e712828e3a7d57cabf1)