diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2017-01-31 12:35:26 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2017-01-31 12:35:26 (GMT) |
| commit | 4de34e0d69bcd99195928c1b25022465862bf0fe (patch) | |
| tree | 5a2e73732ea42b50cd5e18ee42be74dd87e982d5 | |
| parent | 236fc60986c8c567fe99fbffa4a825e22c066aa3 (diff) | |
| parent | d46f72922b8d203286e5553956ffd1156980c4d9 (diff) | |
| download | cpython-4de34e0d69bcd99195928c1b25022465862bf0fe.zip cpython-4de34e0d69bcd99195928c1b25022465862bf0fe.tar.gz cpython-4de34e0d69bcd99195928c1b25022465862bf0fe.tar.bz2 | |
merge 3.5
| -rw-r--r-- | .hgeol | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |