Merge remote-tracking branch 'github/diff' into diff

Stuart Cording · Stuart Cording · commit 847a188cbee1 · 2012-05-08T22:17:27.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,9 @@ intelhexclass/doxygen/man/*
 
 #Ignore extraneous Qt generated files
 *.qm
+
+#Ignore extraneous MSVC files
+*.tlog
+*.obj
+*.log
+*.ipch
