Merge branch 'rr/remove-contrib-some'

diff --git a/.gitignore b/.gitignore
index 6669bf0c6c9a0b42f74e2ed189350a6a9f11f17d..1640c3ad005adbeecf4b90f92e5d3369c6490697 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@
 /git-remote-ftps
 /git-remote-fd
 /git-remote-ext
+/git-remote-testgit
 /git-remote-testpy
 /git-remote-testsvn
 /git-repack
@@ -228,6 +229,7 @@
 /cscope*
 *.obj
 *.lib
+*.res
 *.sln
 *.suo
 *.ncb