[Python-checkins] cpython (merge 3.6 -> default): merge 3.6
matthias.klose
python-checkins at python.org
Tue Jan 31 07:36:06 EST 2017
https://hg.python.org/cpython/rev/615ca1a68d4e
changeset: 106350:615ca1a68d4e
parent: 106346:3d328ee18612
parent: 106349:b57911899c94
user: doko at ubuntu.com
date: Tue Jan 31 13:35:56 2017 +0100
summary:
merge 3.6
files:
.hgeol | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/.hgeol b/.hgeol
--- a/.hgeol
+++ b/.hgeol
@@ -40,6 +40,9 @@
Lib/test/coding20731.py = BIN
+# Windows only zlib upstream file
+Modules/zlib/zlib.map = CRLF
+
# Windows batch files work best with CRLF, there can be subtle problems with LF
**.bat = CRLF
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list