[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/ea43a99d7536
changeset:   70952:ea43a99d7536
parent:      70950:67ea5cebca1c
parent:      70951:eaaa073a9a42
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Jun 25 12:38:16 2011 +0300
summary:
  Merge with 3.2.

files:
  .bzrignore |  3 +++
  .gitignore |  3 +++
  .hgignore  |  3 +++
  3 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/.bzrignore b/.bzrignore
--- a/.bzrignore
+++ b/.bzrignore
@@ -37,3 +37,6 @@
 Lib/lib2to3/Grammar*.pickle
 Lib/lib2to3/PatternGrammar*.pickle
 __pycache__
+.coverage
+coverage/*
+htmlcov/*
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,6 @@
 python
 python-gdb.py
 tags
+.coverage
+coverage/
+htmlcov/
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -70,3 +70,6 @@
 PCbuild/x64-temp-*
 __pycache__
 Modules/_testembed
+.coverage
+coverage/
+htmlcov/

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