Merge 3.14 branch into 3.15

epics-modules · May 30, 2017 · 12d22e3 · 12d22e3
2 parents 98b0f7e + 0dc850f
commit 12d22e3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ O.*/
 /QtC-*
 *.orig
 *.log
+.*.swp