Merge 3.15 branch into 3.16

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

1
.gitignore vendored
View File

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