Merge 3.14 branch into 3.15

This commit is contained in:
Andrew Johnson
2017-05-30 17:14:56 -05:00

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ O.*/
/QtC-*
*.orig
*.log
.*.swp