[Python-checkins] cpython (merge 3.5 -> 3.5): merge heads

[benjamin.peterson]

https://hg.python.org/cpython/rev/4e0f56794a73
changeset:   103042:4e0f56794a73
branch:      3.5
parent:      103040:4d531711cbc7
parent:      103038:5f4d5d64007d
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Sep 05 10:17:22 2016 -0700
summary:
  merge heads

files:
  .gitignore |  8 +++++---
  .hgignore  |  3 +++
  2 files changed, 8 insertions(+), 3 deletions(-)


diff --git a/.gitignore b/.gitignore
--- 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.lineno
 core
 db_home
-config.log
-config.status
+.hg/
+ipch/
 libpython*.a
 libpython*.so*
 platform
@@ -93,3 +93,5 @@
 Tools/msi/obj
 Tools/ssl/amd64
 Tools/ssl/win32
+.vs/
+.vscode/
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -94,7 +94,10 @@
 *.gcda
 *.gcno
 *.gcov
+ipch/
 coverage.info
 Tools/msi/obj
 Tools/ssl/amd64
 Tools/ssl/win32
+.vs/
+.vscode/

-- 
Repository URL: https://hg.python.org/cpython