Merge commit 'b9ea301e02472d0982b0fa0f80294bd95885bde8'
[ffmpeg.git] / .gitignore
index 2b251c9..0e57cb0 100644 (file)
@@ -18,6 +18,9 @@
 *.so.*
 *.swp
 *.ver
+*.version
+*.ptx
+*.ptx.c
 *_g
 \#*
 .\#*
 /ffmpeg
 /ffplay
 /ffprobe
-/ffserver
-/config.*
+/config.asm
+/config.h
 /coverage.info
 /avversion.h
 /lcov/
 /src
+/mapfile