summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-06-25 12:38:16 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2011-06-25 12:38:16 +0300
commit473bc274333c2d7cf476f55180a3afef19fe663b (patch)
tree94c3c01be69a0fab1a225b522b814d407351c98d
parent12fb2f41f06e2ef084fffb23688ba21e52e3e012 (diff)
parentf00bfa201989d6e3f70c1186c27a46152f631b6e (diff)
downloadcpython-git-473bc274333c2d7cf476f55180a3afef19fe663b.tar.gz
Merge with 3.2.
-rw-r--r--.bzrignore3
-rw-r--r--.gitignore3
-rw-r--r--.hgignore3
3 files changed, 9 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 376f00f590..e893a7dfcf 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -37,3 +37,6 @@ Lib/test/data/*
Lib/lib2to3/Grammar*.pickle
Lib/lib2to3/PatternGrammar*.pickle
__pycache__
+.coverage
+coverage/*
+htmlcov/*
diff --git a/.gitignore b/.gitignore
index ad3d0e790b..63f4314e05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,6 @@ pyconfig.h
python
python-gdb.py
tags
+.coverage
+coverage/
+htmlcov/
diff --git a/.hgignore b/.hgignore
index 7bb2457d11..6a2615b94b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -70,3 +70,6 @@ PCbuild/Win32-temp-*
PCbuild/x64-temp-*
__pycache__
Modules/_testembed
+.coverage
+coverage/
+htmlcov/