summaryrefslogtreecommitdiffstats
path: root/.hgignore
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-03-21 19:10:15 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-03-21 19:10:15 (GMT)
commit5391211b547990b6537e47df45e98e99c11c9b94 (patch)
treea5419e562b676d2bd48f2e834fc43a835f29f568 /.hgignore
parent8da105e6a9e7ee570bc711fd279d925ba9edd526 (diff)
downloadcpython-5391211b547990b6537e47df45e98e99c11c9b94.zip
cpython-5391211b547990b6537e47df45e98e99c11c9b94.tar.gz
cpython-5391211b547990b6537e47df45e98e99c11c9b94.tar.bz2
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--.hgignore4
1 files changed, 2 insertions, 2 deletions
diff --git a/.hgignore b/.hgignore
index df3a52e..1212cc3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -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