summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-03-21 00:24:41 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-03-21 00:24:41 (GMT)
commitaa43e152b372ce3aa3dc8ca65ef943027c0cca42 (patch)
treeb50e00c4ae2012d205c95020da030ef5164cf8a7
parent41575c9282640da6a03398a2f4c26d800c75f157 (diff)
downloadcpython-aa43e152b372ce3aa3dc8ca65ef943027c0cca42.zip
cpython-aa43e152b372ce3aa3dc8ca65ef943027c0cca42.tar.gz
cpython-aa43e152b372ce3aa3dc8ca65ef943027c0cca42.tar.bz2
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 ........
-rw-r--r--.hgignore6
1 files changed, 3 insertions, 3 deletions
diff --git a/.hgignore b/.hgignore
index a0868fa..066103a 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
@@ -66,4 +66,4 @@ PCbuild/*.exp
PCbuild/*.o
PCbuild/*.ncb
PCbuild/*.bsc
-PCbuild/Win32-temp-* \ No newline at end of file
+PCbuild/Win32-temp-*