[Python-checkins] r79215 - in python/branches/release31-maint: .hgignore

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Mar 21 20:10:15 2010
New Revision: 79215

Log:
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
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/.hgignore

Modified: python/branches/release31-maint/.hgignore
==============================================================================
--- python/branches/release31-maint/.hgignore	(original)
+++ python/branches/release31-maint/.hgignore	Sun Mar 21 20:10:15 2010
@@ -13,8 +13,8 @@
 EUC-JP.TXT
 EUC-KR.TXT
 JOHAB.TXT
-Makefile
-Makefile.pre
+Makefile$
+Makefile.pre$
 NormalizationTest-3.2.0.txt
 NormalizationTest.txt
 SHIFTJIS.TXT