merge 3.6

This commit is contained in:
doko@ubuntu.com 2017-01-31 13:35:56 +01:00
commit a12f123f82
1 changed files with 3 additions and 0 deletions

3
.hgeol
View File

@ -40,6 +40,9 @@ Lib/venv/scripts/nt/* = BIN
Lib/test/coding20731.py = 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 # Windows batch files work best with CRLF, there can be subtle problems with LF
**.bat = CRLF **.bat = CRLF