Merge commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index cb9cbec6bc337b4afaa85ba384351fb5aaecea20..5cabe507a30f8b0c26fcda635848865499b229d7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@
 *-example
 *-test
 *_g
+\#*
+.\#*
 /.config
 /.version
 /ffmpeg