[Python-checkins] r79161 - in python/branches/py3k: .hgignore

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Mar 21 01:22:55 2010
New Revision: 79161

Log:
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/py3k/   (props changed)
   python/branches/py3k/.hgignore

Modified: python/branches/py3k/.hgignore
==============================================================================
--- python/branches/py3k/.hgignore	(original)
+++ python/branches/py3k/.hgignore	Sun Mar 21 01:22:55 2010
@@ -1,8 +1,8 @@
 .gdb_history
 .purify
 .svn
-Makefile
-Makefile.pre
+Makefile$
+Makefile.pre$
 TAGS
 autom4te.cache
 build