diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-09-05 10:17:22 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-09-05 10:17:22 -0700 |
| commit | 80109d3351d2d1758caa2ff37bc4b69cc91a2fbe (patch) | |
| tree | 83885441cee5ba01d727a9110da05d6b2f08007c | |
| parent | 2f40ed4b94ad48cca01a96620da8c3eb15493539 (diff) | |
| parent | 63cf72d692452c017543a7a94447692f039cc797 (diff) | |
| download | cpython-git-80109d3351d2d1758caa2ff37bc4b69cc91a2fbe.tar.gz | |
merge heads
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | .hgignore | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index c2b4fc703f..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,3 +93,5 @@ htmlcov/ Tools/msi/obj Tools/ssl/amd64 Tools/ssl/win32 +.vs/ +.vscode/ @@ -94,7 +94,10 @@ htmlcov/ *.gcda *.gcno *.gcov +ipch/ coverage.info Tools/msi/obj Tools/ssl/amd64 Tools/ssl/win32 +.vs/ +.vscode/ |