summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2017-02-01 12:02:16 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2017-02-01 12:02:16 (GMT)
commitc9473b838aabdf35ad97d82ee2091c3a6b939188 (patch)
tree243419da64435c9ef7279cb76028b528e18ede1b /Misc
parent2145387abc6b1b3b2695cac72cbfc83b5efeeec9 (diff)
parentf8c5f3030305cc0e5d61ddd443fec48446890a11 (diff)
downloadcpython-c9473b838aabdf35ad97d82ee2091c3a6b939188.zip
cpython-c9473b838aabdf35ad97d82ee2091c3a6b939188.tar.gz
cpython-c9473b838aabdf35ad97d82ee2091c3a6b939188.tar.bz2
Merge 3.6
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 6aed6d3..9289940 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -218,7 +218,7 @@ Core and Builtins
Extension Modules
-----------------
-- Issue #29169: Update zlib to 1.2.10.
+- Issue #29169: Update zlib to 1.2.11.
Library
-------