summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-09-01 23:04:18 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-09-01 23:04:18 (GMT)
commit51bae475e8a2c13bba2b6550265b7c92078f704c (patch)
tree62d10b53083e0a77f8e3fabb58ee6ab521ff997d
parent56dadf7d021691634d52b8b310cdd4a1fe872c65 (diff)
parenta0f482a7ffea8ee35f4ca103e3a69862364d4025 (diff)
downloadcpython-51bae475e8a2c13bba2b6550265b7c92078f704c.zip
cpython-51bae475e8a2c13bba2b6550265b7c92078f704c.tar.gz
cpython-51bae475e8a2c13bba2b6550265b7c92078f704c.tar.bz2
Merge with 3.3
-rw-r--r--.hgeol1
1 files changed, 0 insertions, 1 deletions
diff --git a/.hgeol b/.hgeol
index c3788ce..cf6a0f1 100644
--- a/.hgeol
+++ b/.hgeol
@@ -26,7 +26,6 @@
**.xar = BIN
**.zip = BIN
-Lib/email/test/data/msg_26.txt = BIN
Lib/test/cjkencodings/* = BIN
Lib/test/decimaltestdata/*.decTest = BIN
Lib/test/sndhdrdata/sndhdr.* = BIN