[Python-checkins] cpython (merge 3.5 -> 3.6): merge 3.5

[matthias.klose]

https://hg.python.org/cpython/rev/b57911899c94
changeset:   106349:b57911899c94
branch:      3.6
parent:      106345:23fcc0e51510
parent:      106348:b4c94b823bfe
user:        doko at ubuntu.com
date:        Tue Jan 31 13:35:26 2017 +0100
summary:
  merge 3.5

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