Merge branch 'trunk' of https://github.com/benoitdion/thrift into trunk

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1326086 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.gitignore b/.gitignore
index b97e312..6b0462f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -241,3 +241,13 @@
 *.user
 *.ipch
 *.sdf
+
+*_ReSharper*
+lib/cpp/Debug/
+lib/cpp/Release/
+*.opensdf
+lib/cpp/x64/Debug/
+lib/cpp/x64/Release
+compiler/cpp/src/thrifty.h
+compiler/cpp/src/thrifty.cc
+compiler/cpp/src/thriftl.cc
\ No newline at end of file