Merge remote-tracking branch 'Dineshs91/f4m-2.0'

[youtube-dl] / .gitignore

diff --git a/.gitignore b/.gitignore
index a4204620b8d3cd62fb067aa5983cbea55d08e7c2..0422adf4456ec35166f5d2bce6b832c67601c2dc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.pyc
 *.pyo
 *~
+*.DS_Store
 wine-py2exe/
 py2exe.log
 *.kate-swp
@@ -10,8 +11,25 @@ MANIFEST
 README.txt
 youtube-dl.1
 youtube-dl.bash-completion
+youtube-dl.fish
 youtube-dl
 youtube-dl.exe
 youtube-dl.tar.gz
 .coverage
 cover/
+updates_key.pem
+*.egg-info
+*.srt
+*.sbv
+*.vtt
+*.flv
+*.mp4
+*.m4a
+*.m4v
+*.part
+*.swp
+test/testdata
+.tox
+youtube-dl.zsh
+.idea
+.idea/*
\ No newline at end of file