Merge tag 'upstream/2016.08.17'

[youtubedl] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6c532b46ae0dd1fe2cbdd3f98548978eaf9fb972..a802c75a10225f53f8da414fa34fd5422de5bea2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,43 @@
 *.pyc
 *.pyo
 *.pyc
 *.pyo

+*.class

 *~
 *~

-/.pc
+*.DS_Store

 wine-py2exe/
 py2exe.log
 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
+*.part
+*.swp
+test/testdata
+test/local_parameters.json
+.tox
+youtube-dl.zsh
+
+# IntelliJ related files
+.idea
+*.iml
+
+tmp/