mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 12:52:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge heads

Browse source
This commit is contained in:
Benjamin Peterson 2016-09-05 10:17:30 -07:00
commit 177a42438d
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -1,7 +1,7 @@
# Two-trick pony for OSX and other case insensitive file systems: # Two-trick pony for OSX and other case insensitive file systems:
# Ignore ./python binary on Unix but still look into ./Python/ directory. # Ignore ./python binary on Unix but still look into ./Python/ directory.
/python /python
!/Python/** !/Python/
*.cover *.cover
*.o *.o
*.orig *.orig
@ -69,8 +69,8 @@ config.status
config.status.lineno config.status.lineno
core core
db_home db_home
config.log .hg/
config.status ipch/
libpython*.a libpython*.a
libpython*.so* libpython*.so*
platform platform
@ -93,4 +93,5 @@ htmlcov/
Tools/msi/obj Tools/msi/obj
Tools/ssl/amd64 Tools/ssl/amd64
Tools/ssl/win32 Tools/ssl/win32
.vs/
.vscode/ .vscode/

3
.hgignore
View file

@ -95,7 +95,10 @@ htmlcov/
*.gcda *.gcda
*.gcno *.gcno
*.gcov *.gcov
ipch/
coverage.info coverage.info
Tools/msi/obj Tools/msi/obj
Tools/ssl/amd64 Tools/ssl/amd64
Tools/ssl/win32 Tools/ssl/win32
.vs/
.vscode/