[Python-checkins] r84716 - in python/branches/release31-maint: .bzrignore .hgignore Modules

Sat Sep 11 18:23:57 CEST 2010

Author: benjamin.peterson
Date: Sat Sep 11 18:23:57 2010
New Revision: 84716
Log:
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 (2010年9月11日) | 1 line
 
 Add new generated file to ignoreds.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/.bzrignore
 python/branches/release31-maint/.hgignore
 python/branches/release31-maint/Modules/ (props changed)
Modified: python/branches/release31-maint/.bzrignore
==============================================================================

--- python/branches/release31-maint/.bzrignore	(original)
+++ python/branches/release31-maint/.bzrignore	Sat Sep 11 18:23:57 2010
@@ -45,6 +45,7 @@
 Modules/Setup.config
 Modules/Setup.local
 Modules/config.c
+Modules/ld_so_aix
 Parser/pgen
 Lib/lib2to3/Grammar*.pickle
 Lib/lib2to3/PatternGrammar*.pickle
Modified: python/branches/release31-maint/.hgignore
==============================================================================
--- python/branches/release31-maint/.hgignore	(original)
+++ python/branches/release31-maint/.hgignore	Sat Sep 11 18:23:57 2010
@@ -48,7 +48,7 @@
 Modules/config.c
 Parser/pgen
 core
-
+Modules/ld_so_aix$
 syntax: glob
 libpython*.a
 *.o
