Merge 3.15 branch into 3.16

2017-05-30 17:17:59 -05:00
parent 117e294ec6 12d22e392f
commit 77c00faabe
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ O.*/
 /QtC-*
 *.orig
 *.log
+.*.swp