Merge 3.14 branch into 3.15

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