Merge 3.14 branch into 3.15

2017-05-30 17:14:56 -05:00
parent 98b0f7e48b 0dc850f4ec
commit 12d22e392f
1 changed files with 1 additions and 0 deletions
@@ -11,3 +11,4 @@ O.*/
 /QtC-*
 *.orig
 *.log
+.*.swp