Merge branch 'jython-support'

[youtube-dl] / .gitignore

diff --git a/.gitignore b/.gitignore
index a4204620b8d3cd62fb067aa5983cbea55d08e7c2..26dbde73d412673ee9c53ee06a476a803a92edc7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.pyc
 *.pyo
+*.class
 *~
+*.DS_Store
 wine-py2exe/
 py2exe.log
 *.kate-swp
@@ -10,8 +12,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/*