Merge remote-tracking branch 'qatar/master'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3e8ed0046e6ab629637b7b7a6ba6a0f9f4d28601..c922b8855df0a5107258c184bb269dc8f935bd34 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,5 +44,4 @@ tools/pktdumper
 tools/probetest
 tools/qt-faststart
 tools/trasher
-tools/trasher*.d
 version.h