Merge 3.15 branch into 3.16

This commit is contained in:
Andrew Johnson committed 2017-05-30 17:17:59 -05:00
commit 77c00faabe
1 file changed
+1
+1
View File
@@ -11,3 +11,4 @@ O.*/
/QtC-*
*.orig
*.log
.*.swp