Merged revisions 84705 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84705 | georg.brandl | 2010-09-11 01:39:58 -0500 (Sat, 11 Sep 2010) | 1 line

  Add new generated file to ignoreds.
........

diff --git a/.bzrignore b/.bzrignore
index 3407d6524504aa99b3c76de0d10f64f357713690..463e983e869b153792ffbde5ab2f02797b03093f 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -45,6 +45,7 @@ Modules/Setup
 Modules/Setup.config
 Modules/Setup.local
 Modules/config.c
+Modules/ld_so_aix
 Parser/pgen
 Lib/lib2to3/Grammar*.pickle
 Lib/lib2to3/PatternGrammar*.pickle

diff --git a/.hgignore b/.hgignore
index 1212cc31f4c08f1d1671c0973f9396d87e83653a..d1c8d72502afdac4abd32b3e5e89956979a6f353 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -48,7 +48,7 @@ Modules/Setup.local
 Modules/config.c
 Parser/pgen
 core
-
+Modules/ld_so_aix$
 syntax: glob
 libpython*.a
 *.o