From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Sep 2010 16:23:57 +0000 (+0000)
Subject: Merged revisions 84705 via svnmerge from
X-Git-Tag: v3.1.3rc1~248
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d7d9e6899222885da76f578fa0c70e5946badbb;p=python

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 3407d65245..463e983e86 100644
--- 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 1212cc31f4..d1c8d72502 100644
--- 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