summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-07-23 15:04:11 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-07-23 15:04:11 (GMT)
commit1f7480a67ee4221d928cbecb1e45b3aae78df4a9 (patch)
tree274110578339c0992d81ef3090485fd34c38e7e8
parentedddc2704ceecdb9a2584b36a8ad00368d19d232 (diff)
downloadcpython-1f7480a67ee4221d928cbecb1e45b3aae78df4a9.zip
cpython-1f7480a67ee4221d928cbecb1e45b3aae78df4a9.tar.gz
cpython-1f7480a67ee4221d928cbecb1e45b3aae78df4a9.tar.bz2
Fixes bad Misc/NEWS merge
-rw-r--r--Misc/NEWS9
1 files changed, 3 insertions, 6 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 8f1aa34..bb553a3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,9 @@ Tests
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 @@ Build
- 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
-----------