From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 11 Mar 2011 22:44:04 +0000 (+0100)
Subject: Merge #11403
X-Git-Tag: v3.2.1b1~323
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd8f2e7edf1e8221398310ff34e4fc5e862a5471;p=thirdparty%2FPython%2Fcpython.git

Merge #11403
---

dd8f2e7edf1e8221398310ff34e4fc5e862a5471
diff --cc .hgignore
index e9286447d694,33e6caa649e0..d3983dcf2ea4
--- a/.hgignore
+++ b/.hgignore
@@@ -49,7 -60,9 +49,10 @@@ libpython*.
  *.rej
  *~
  Lib/lib2to3/*.pickle
 +Lib/test/data/*
+ PC/python_nt*.h
+ PC/pythonnt_rc*.h
+ PC/*.obj
  PCbuild/*.exe
  PCbuild/*.dll
  PCbuild/*.pdb