diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-03-21 19:10:15 +0000 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-03-21 19:10:15 +0000 |
commit | 26c2cad3ed73971165c9af54bfb47cc5bde7bfb7 (patch) | |
tree | 103e5c321b6b4974509c7d9e8128586b9d2635d2 /.hgignore | |
parent | f2836aa579d6b9026a765ca6b4e2db8543e827be (diff) | |
download | cpython-26c2cad3ed73971165c9af54bfb47cc5bde7bfb7.tar.gz |
Merged revisions 79161 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r79161 | antoine.pitrou | 2010-03-21 01:22:55 +0100 (dim., 21 mars 2010) | 9 lines
Merged revisions 79160 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79160 | antoine.pitrou | 2010-03-21 01:21:43 +0100 (dim., 21 mars 2010) | 3 lines
Fix overzealous .hgignore file
........
................
Diffstat (limited to '.hgignore')
-rw-r--r-- | .hgignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -13,8 +13,8 @@ EUC-JISX0213.TXT EUC-JP.TXT EUC-KR.TXT JOHAB.TXT -Makefile -Makefile.pre +Makefile$ +Makefile.pre$ NormalizationTest-3.2.0.txt NormalizationTest.txt SHIFTJIS.TXT |