Merge tag 'upstream/2016.12.01'

[youtubedl] / .gitignore

diff --git a/.gitignore b/.gitignore
index 996489d8ec6becd3a441cdbecd1f83c31eea944d..9ce4b5e2d5d78771b718313ff942afe77db92f02 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.pyc
 *.pyo
+*.class
 *~
+*.DS_Store
 wine-py2exe/
 py2exe.log
 *.kate-swp
@@ -10,6 +12,37 @@ MANIFEST
 README.txt
 youtube-dl.1
 youtube-dl.bash-completion
+youtube-dl.fish
+youtube_dl/extractor/lazy_extractors.py
 youtube-dl
 youtube-dl.exe
 youtube-dl.tar.gz
+.coverage
+cover/
+updates_key.pem
+*.egg-info
+*.srt
+*.sbv
+*.vtt
+*.flv
+*.mp4
+*.m4a
+*.m4v
+*.mp3
+*.3gp
+*.wav
+*.ape
+*.mkv
+*.swf
+*.part
+*.swp
+test/testdata
+test/local_parameters.json
+.tox
+youtube-dl.zsh
+
+# IntelliJ related files
+.idea
+*.iml
+
+tmp/