merge 3.6

a12f123f · doko@ubuntu.com · 7964d2b2 · 4de34e0d · a12f123f
Commit a12f123f authored Jan 31, 2017 by doko@ubuntu.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

.hgeol .hgeol +3 -0

No files found.
--- 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