diff options
author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-11-29 15:38:07 +0100 |
---|---|---|
committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-11-29 15:38:07 +0100 |
commit | 8192ebe1f874b22b0c27e675a4136a06e46a68ce (patch) | |
tree | 43e0feda4e3381d0c9455a7760093533d47145a5 /__main__.py | |
parent | caaa47d37215f498c033afb42972c135be8138d4 (diff) | |
parent | 20ba04267c3c2be27a766a43f34014012799b761 (diff) | |
download | youtube-dl-8192ebe1f874b22b0c27e675a4136a06e46a68ce.tar.xz |
Merge remote-tracking branch 'origin/master' into fork_master
New tests - merged with md5 correction
Diffstat (limited to '__main__.py')
-rwxr-xr-x | __main__.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/__main__.py b/__main__.py deleted file mode 100755 index fc3cc8ad8..000000000 --- a/__main__.py +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -import youtube_dl - -if __name__ == '__main__': - youtube_dl.main() |