diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-09-05 10:17:30 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-09-05 10:17:30 -0700 |
| commit | 177a42438d9ab8e8b261f6dc7efb10b1c401d710 (patch) | |
| tree | 6372bf774d996d812bbaed4accc6ce3521905993 | |
| parent | 98020812e6f82d22308f4fc1169fe066254d3a72 (diff) | |
| parent | 64c7c8638922c2d06ffe8d4dcbb1d7b7b5979058 (diff) | |
| download | cpython-git-177a42438d9ab8e8b261f6dc7efb10b1c401d710.tar.gz | |
merge heads
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | .hgignore | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index a946596ae6..d267d15c74 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # Two-trick pony for OSX and other case insensitive file systems: # Ignore ./python binary on Unix but still look into ./Python/ directory. /python -!/Python/** +!/Python/ *.cover *.o *.orig @@ -69,8 +69,8 @@ config.status config.status.lineno core db_home -config.log -config.status +.hg/ +ipch/ libpython*.a libpython*.so* platform @@ -93,4 +93,5 @@ htmlcov/ Tools/msi/obj Tools/ssl/amd64 Tools/ssl/win32 +.vs/ .vscode/ @@ -95,7 +95,10 @@ htmlcov/ *.gcda *.gcno *.gcov +ipch/ coverage.info Tools/msi/obj Tools/ssl/amd64 Tools/ssl/win32 +.vs/ +.vscode/ |