Merge branch 'jython-support'

[youtube-dl] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7dd0ad09b06c172596ca751a22055b9a3d6207d4..26dbde73d412673ee9c53ee06a476a803a92edc7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 *.pyo
+*.class
 *~
 *.DS_Store
 wine-py2exe/
@@ -11,6 +12,7 @@ MANIFEST
 README.txt
 youtube-dl.1
 youtube-dl.bash-completion
+youtube-dl.fish
 youtube-dl
 youtube-dl.exe
 youtube-dl.tar.gz
@@ -23,6 +25,12 @@ updates_key.pem
 *.vtt
 *.flv
 *.mp4
+*.m4a
+*.m4v
 *.part
+*.swp
 test/testdata
 .tox
+youtube-dl.zsh
+.idea
+.idea/*