Merge branch 'jython-support'

[youtube-dl] / .gitignore

diff --git a/.gitignore b/.gitignore
index 86312d4e4185cd6dbd56627a3f2ce9f8ef5e9a43..26dbde73d412673ee9c53ee06a476a803a92edc7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 *.pyo
+*.class
 *~
 *.DS_Store
 wine-py2exe/
@@ -31,3 +32,5 @@ updates_key.pem
 test/testdata
 .tox
 youtube-dl.zsh
+.idea
+.idea/*