Merge tag 'upstream/2012.12.11'

[youtubedl] / .gitignore

diff --git a/.gitignore b/.gitignore
index e51512d4f2b19ea07bdbce4e15043f13797eaa2e..b13aa177d91b60eaa76d61d3a5cb6554eb9123ab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,16 @@
 *.pyc
 *.pyo
 *~
 *.pyc
 *.pyo
 *~

+/.pc

 wine-py2exe/
 py2exe.log
 wine-py2exe/
 py2exe.log

+*.kate-swp
+build/
+dist/
+MANIFEST
+README.txt
+youtube-dl.1
+youtube-dl.bash-completion
+youtube-dl
+youtube-dl.exe
+youtube-dl.tar.gz