summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2013-10-22 19:45:13 (GMT)
committerTim Golden <mail@timgolden.me.uk>2013-10-22 19:45:13 (GMT)
commit17934856dc76b8cf1667a293445df6aeca225768 (patch)
treee77c8c8ac228a214eb56e78db1133042feb7d4d9 /Misc
parent51c4d72d436769dab2edbbc7b4685912546e8d47 (diff)
downloadcpython-17934856dc76b8cf1667a293445df6aeca225768.zip
cpython-17934856dc76b8cf1667a293445df6aeca225768.tar.gz
cpython-17934856dc76b8cf1667a293445df6aeca225768.tar.bz2
Issue #15207: Fix mimetypes to read from correct area in Windows registry (Original patch by Dave Chambers)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index ffa3154..e276960 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -166,6 +166,7 @@ Jesús Cea Avión
Per Cederqvist
Carl Cerecke
Octavian Cerna
+Dave Chambers
Pascal Chambon
John Chandler
Hye-Shik Chang
diff --git a/Misc/NEWS b/Misc/NEWS
index 80a1a23..3ee2643 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@ Core and Builtins
Library
-------
+- Issue #15207: Fix mimetypes to read from correct part of Windows registry
+ Original patch by Dave Chambers
+
- Issue #8964: fix platform._sys_version to handle IronPython 2.6+.
Patch by Martin Matusiak.