From 5d7d9e6899222885da76f578fa0c70e5946badbb Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 11 Sep 2010 16:23:57 +0000 Subject: 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. ........ --- .bzrignore | 1 + .hgignore | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.bzrignore b/.bzrignore index 3407d65..463e983 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 1212cc3..d1c8d72 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 -- cgit v0.12