[Python-checkins] cpython: Fixes bad Misc/NEWS merge

steve.dower python-checkins at python.org
Sat Jul 23 11:04:39 EDT 2016


https://hg.python.org/cpython/rev/58b2d8fd83c2
changeset:   102432:58b2d8fd83c2
user:        Steve Dower <steve.dower at microsoft.com>
date:        Sat Jul 23 08:04:11 2016 -0700
summary:
  Fixes bad Misc/NEWS merge

files:
  Misc/NEWS |  9 +++------
  1 files changed, 3 insertions(+), 6 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,9 @@
 Windows
 -------
 
+- Issue #27469: Adds a shell extension to the launcher so that drag and drop
+  works correctly.
+
 - Issue #27309: Enables proper Windows styles in python[w].exe manifest.
 
 What's New in Python 3.6.0 alpha 3
@@ -244,12 +247,6 @@
 
 - Don't use largefile support for GNU/Hurd.
 
-Windows
--------
-
-- Issue #27469: Adds a shell extension to the launcher so that drag and drop
-  works correctly.
-
 Tools/Demos
 -----------
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list