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. ........
2010-09-11 16:23:57 +00:00 · 2010-09-11 16:23:57 +00:00 · 5d7d9e6899
parent 8042f4af29
commit 5d7d9e6899
2 changed files with 2 additions and 1 deletions
--- 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
--- 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