Merge branch 'master' into subtitles_rework

[youtube-dl] / .gitignore

diff --git a/.gitignore b/.gitignore
index a4204620b8d3cd62fb067aa5983cbea55d08e7c2..61cb6bc3c8db2abcd0126c665cc6fbc526a101cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.pyc
 *.pyo
 *~
+*.DS_Store
 wine-py2exe/
 py2exe.log
 *.kate-swp
@@ -15,3 +16,11 @@ youtube-dl.exe
 youtube-dl.tar.gz
 .coverage
 cover/
+updates_key.pem
+*.egg-info
+*.srt
+*.sbv
+*.vtt
+*.flv
+*.mp4
+*.part