summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-08-14 03:59:54 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-08-14 03:59:54 (GMT)
commita85e2175bbaa944d718e312c8befe5b619e9b86c (patch)
tree11750410108264e7cc443ab6e322dccfc2ecfc13 /Misc
parentda668ff24fc7d959ad2938f128281dcc49d168d8 (diff)
downloadcpython-a85e2175bbaa944d718e312c8befe5b619e9b86c.zip
cpython-a85e2175bbaa944d718e312c8befe5b619e9b86c.tar.gz
cpython-a85e2175bbaa944d718e312c8befe5b619e9b86c.tar.bz2
Manually merge r83995: Fix version{added,changed} and spacing in NEWS
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2afb99a..8b9ef66 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,7 +84,7 @@ Library
-------
- Issue #8688: MANIFEST files created by distutils now include a magic
- comment indicating they are generated. Manually maintained MANIFESTs
+ comment indicating they are generated. Manually maintained MANIFESTs
without this marker will not be overwritten or removed.
- Issue #7467: when reading a file from a ZIP archive, its CRC is checked