Merge with 3.4

This commit is contained in:
Zachary Ware 2015-04-13 12:30:53 -05:00
commit 50ebf0316a
2 changed files with 344 additions and 341 deletions

3
.hgeol
View File

@ -43,6 +43,9 @@ Lib/test/coding20731.py = BIN
# 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
# The Windows readme is likely to be read in Notepad, so make it readable
PCbuild/readme.txt = CRLF
# All other files (which presumably are human-editable) are "native". # All other files (which presumably are human-editable) are "native".
# This must be the last rule! # This must be the last rule!