Merge tag 'upstream/2016.12.01'

[youtubedl] / .gitignore

diff --git a/.gitignore b/.gitignore
index 95401e0a7d3280d88dd6c609a2d182a3a9d34653..9ce4b5e2d5d78771b718313ff942afe77db92f02 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,48 @@
 *.pyc
 *.pyo
+*.class
 *~
+*.DS_Store
+wine-py2exe/
+py2exe.log
+*.kate-swp
+build/
+dist/
+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/