From: Rogério Brito Date: Tue, 18 Dec 2012 11:14:18 +0000 (-0200) Subject: Merge tag 'upstream/2012.12.11' X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/c4994c6aff3e03c7848b0a9d4ff9a1873412d31f?ds=inline Merge tag 'upstream/2012.12.11' Upstream version 2012.12.11 --- c4994c6aff3e03c7848b0a9d4ff9a1873412d31f diff --cc .gitignore index 6c532b4,996489d..b13aa17 --- a/.gitignore +++ b/.gitignore @@@ -1,6 -1,15 +1,16 @@@ *.pyc *.pyo *~ +/.pc 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