Merge remote-tracking branch 'qatar/master'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index 833ae7911b90d35e553dac474abe5ff5c959ab07..89c78e4a7797d952a374162196a04ddba9d671c0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ config.*
 doc/*.1
 doc/*.html
 doc/*.pod
+doc/fate.txt
 doxy
 ffmpeg
 ffplay