summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2011-03-27 19:09:00 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2011-03-27 19:09:00 (GMT)
commitaf88d866994a20d13b75ecad6ab5144ef5bcc9fc (patch)
tree032d67c68ba31bde0f3354a3f6b01a299c38bd60 /Misc
parentad64127878d4c00673a51a3fe5b7cbf7cd33fc19 (diff)
parent987403bf1494b2f10d27f9be6bf624d7d920dbaf (diff)
downloadcpython-af88d866994a20d13b75ecad6ab5144ef5bcc9fc.zip
cpython-af88d866994a20d13b75ecad6ab5144ef5bcc9fc.tar.gz
cpython-af88d866994a20d13b75ecad6ab5144ef5bcc9fc.tar.bz2
merge #11696
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index accb03d..3a2e29a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -574,6 +574,7 @@ Chris McDonough
Greg McFarlane
Alan McIntyre
Michael McLay
+Mark Mc Mahon
Gordon McMillan
Caolan McNamara
Andrew McNamara
diff --git a/Misc/NEWS b/Misc/NEWS
index 1caef03..0c0e136 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -87,6 +87,8 @@ Core and Builtins
Library
-------
+- Issue #11696: Fix ID generation in msilib.
+
- Issue #11692: Remove unnecessary demo functions in subprocess module.
- Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when