diff options
author | Ismael Mejia <[email protected]> | 2013-08-22 23:29:36 +0200 |
---|---|---|
committer | Ismael Mejia <[email protected]> | 2013-08-22 23:29:36 +0200 |
commit | 18b4e04f1c663e0ea695f6501b860f85af9d7ca1 (patch) | |
tree | d60ebbf51b8c50f808c6c251fc6c02547052a9dc /.gitignore | |
parent | d80a064eff4fe2416f9db36b07f1e2ca641f1334 (diff) | |
parent | 1865ed31b955795f9859df5c1c400d172ae9a28a (diff) | |
download | youtube-dl-18b4e04f1c663e0ea695f6501b860f85af9d7ca1.tar.gz youtube-dl-18b4e04f1c663e0ea695f6501b860f85af9d7ca1.zip |
Merge branch 'master' into subtitles_rework
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index fca34b8ba..61cb6bc3c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ build/ dist/ MANIFEST README.txt -README.md youtube-dl.1 youtube-dl.bash-completion youtube-dl |