Merge remote-tracking branch 'origin/master'

[youtube-dl] / .gitignore

diff --git a/.gitignore b/.gitignore
index 12b25ba881635792f30ff777877daa84e6f0e2f9..24fdb3626cd0d306cd5fc1367543f4b3691394c3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,27 @@
 *.pyc
 *.pyo
 *~
+*.DS_Store
 wine-py2exe/
 py2exe.log
-
-#OS X
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-._*
-.Spotlight-V100
-.Trashes
+*.kate-swp
+build/
+dist/
+MANIFEST
+README.txt
+youtube-dl.1
+youtube-dl.bash-completion
+youtube-dl
+youtube-dl.exe
+youtube-dl.tar.gz
+.coverage
+cover/
+updates_key.pem
+*.egg-info
+*.srt
+*.sbv
+*.vtt
+*.flv
+*.mp4
+*.part
+test/testdata