[Python-checkins] (merge default -> default): merge

[brett.cannon]

http://hg.python.org/cpython/rev/20c91fcc2ca6
changeset:   68388:20c91fcc2ca6
parent:      68387:4daad4adaf46
parent:      68386:8c9fa86a613e
user:        Brett Cannon <brett at python.org>
date:        Fri Mar 11 17:46:21 2011 -0500
summary:
  merge

files:
  

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -50,6 +50,9 @@
 *~
 Lib/lib2to3/*.pickle
 Lib/test/data/*
+PC/python_nt*.h
+PC/pythonnt_rc*.h
+PC/*.obj
 PCbuild/*.exe
 PCbuild/*.dll
 PCbuild/*.pdb

-- 
Repository URL: http://hg.python.org/cpython