diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2017-01-31 13:35:56 +0100 |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2017-01-31 13:35:56 +0100 |
| commit | a12f123f82cee9c5ae88cf2f879c1f071b458948 (patch) | |
| tree | dc7627278583d7d2715cb327edcb8e3793d7b822 | |
| parent | 7964d2b22e32d168034889dbd63c7d940ef502fc (diff) | |
| parent | 4de34e0d69bcd99195928c1b25022465862bf0fe (diff) | |
| download | cpython-git-a12f123f82cee9c5ae88cf2f879c1f071b458948.tar.gz | |
merge 3.6
| -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 |