diff options
| author | mcd1992 <theanonbutinf@gmail.com> | 2014-08-24 15:04:50 -0500 |
|---|---|---|
| committer | mcd1992 <theanonbutinf@gmail.com> | 2014-08-24 15:04:50 -0500 |
| commit | 7833d941bb736a8dbd237f1c7bc268d671cabb68 (patch) | |
| tree | e1e5953190f64754d7e1721c47948040f6018ff7 | |
| parent | a2360a4c80700824f4160505fcdb1ca14261c031 (diff) | |
| download | youtube-dl-7833d941bb736a8dbd237f1c7bc268d671cabb68.tar.gz youtube-dl-7833d941bb736a8dbd237f1c7bc268d671cabb68.tar.xz youtube-dl-7833d941bb736a8dbd237f1c7bc268d671cabb68.zip | |
Rebased with upstream/master
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | youtube_dl/__init__.py | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/README.md b/README.md index 30bdac189..ba9fec8a7 100644 --- a/README.md +++ b/README.md @@ -288,8 +288,6 @@ which means you can modify it, redistribute it or use it however you like. postprocessors (default) --prefer-ffmpeg Prefer ffmpeg over avconv for running the postprocessors - --exec Execute a command after the file is finished downloading, similar to find's -exec format - Example: --exec 'adb push {} /sdcard/Music/ && rm {}' # CONFIGURATION diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 4eae88d6c..7cf5de43f 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -71,12 +71,9 @@ __authors__ = ( 'Sebastian Haas', 'Alexander Kirk', 'Erik Johnson', -<<<<<<< HEAD 'Keith Beckman', 'Ole Ernst', -======= 'Aaron McDaniel (mcd1992)', ->>>>>>> Implemented --exec option. ) __license__ = 'Public Domain' |