Merge branch 'rr/remove-contrib-some'

diff --git a/.gitignore b/.gitignore
index 10aee94760bca452935ac5c0dfc337a0f6b58a30..1640c3ad005adbeecf4b90f92e5d3369c6490697 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -229,6 +229,7 @@
 /cscope*
 *.obj
 *.lib
+*.res
 *.sln
 *.suo
 *.ncb