merge 3.6

miss-islington · Jan 31, 2017 · a12f123 · a12f123
2 parents 7964d2b + 4de34e0
commit a12f123
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.hgeol b/.hgeol
@@ -40,6 +40,9 @@ Lib/venv/scripts/nt/* = BIN
 
 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