Merge tag 'upstream/2016.12.01'

[youtubedl] / .gitignore

diff --git a/.gitignore b/.gitignore
index 77469b8a7993a9b529769452f109e8805e8b1e50..9ce4b5e2d5d78771b718313ff942afe77db92f02 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 *.pyo
 *.pyc
 *.pyo

+*.class

 *~
 *.DS_Store
 wine-py2exe/
 *~
 *.DS_Store
 wine-py2exe/


@@ -11,6 +12,8 @@ MANIFEST
 README.txt
 youtube-dl.1
 youtube-dl.bash-completion
 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
 youtube-dl
 youtube-dl.exe
 youtube-dl.tar.gz


@@ -18,3 +21,28 @@ youtube-dl.tar.gz
 cover/
 updates_key.pem
 *.egg-info
 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/