Merge branch 'jk/maint-add-p-empty' into maint

diff --git a/.gitignore b/.gitignore
index 41c0b20a76ce0fd47c7cafc51777336ce99ce1b0..f0d2e96b888d0a457dbd61ecb6c347c4dbb07f8a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -104,7 +104,9 @@ git-receive-pack
 git-reflog
 git-relink
 git-remote
+git-remote-curl
 git-repack
+git-replace
 git-repo-config
 git-request-pull
 git-rerere
@@ -166,6 +168,7 @@ git.spec
 *.exe
 *.[aos]
 *.py[co]
+*+
 config.mak
 autom4te.cache
 config.cache
@@ -177,3 +180,14 @@ configure
 tags
 TAGS
 cscope*
+*.obj
+*.lib
+*.sln
+*.suo
+*.ncb
+*.vcproj
+*.user
+*.idb
+*.pdb
+Debug/
+Release/