Merge branch 'jython-support'

[youtube-dl] / .gitignore

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