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

[raymond.hettinger]

http://hg.python.org/cpython/rev/bd15651f4328
changeset:   70956:bd15651f4328
parent:      70954:2db99429beb4
parent:      70952:ea43a99d7536
user:        Raymond Hettinger <python at rcn.com>
date:        Sat Jun 25 11:40:20 2011 +0200
summary:
  merge

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