Merge tag 'upstream/2013.05.14'

[youtubedl] / .gitignore

diff --git a/.gitignore b/.gitignore
index 996489d8ec6becd3a441cdbecd1f83c31eea944d..77469b8a7993a9b529769452f109e8805e8b1e50 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.pyc
 *.pyo
 *~
 *.pyc
 *.pyo
 *~

+*.DS_Store

 wine-py2exe/
 py2exe.log
 *.kate-swp
 wine-py2exe/
 py2exe.log
 *.kate-swp


@@ -13,3 +14,7 @@ youtube-dl.bash-completion
 youtube-dl
 youtube-dl.exe
 youtube-dl.tar.gz
 youtube-dl
 youtube-dl.exe
 youtube-dl.tar.gz

+.coverage
+cover/
+updates_key.pem
+*.egg-info